summaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
authorAlan Cox2011-12-17 18:43:40 +0100
committerIngo Molnar2011-12-18 09:17:02 +0100
commit933b9463a0ef75da681747b2dac06c1754465372 (patch)
tree0013765841b854c371f9981c87b3801f6d566d69 /arch/x86/Kconfig
parentx86/intel/scu/ipc: Match the changes in the x86 configuration (diff)
downloadkernel-qcow2-linux-933b9463a0ef75da681747b2dac06c1754465372.tar.gz
kernel-qcow2-linux-933b9463a0ef75da681747b2dac06c1754465372.tar.xz
kernel-qcow2-linux-933b9463a0ef75da681747b2dac06c1754465372.zip
x86/intel config: Revamp configuration to allow for Moorestown and Medfield
This sets all up the other bits that need to be INTEL_MID specific rather than Moorestown specific. Signed-off-by: Alan Cox <alan@linux.intel.com> Link: http://lkml.kernel.org/r/20111217174318.7207.91543.stgit@bob.linux.org.uk Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index ca4ee7644855..c3c9343e4498 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -662,8 +662,8 @@ config HPET_EMULATE_RTC
depends on HPET_TIMER && (RTC=y || RTC=m || RTC_DRV_CMOS=m || RTC_DRV_CMOS=y)
config APB_TIMER
- def_bool y if MRST
- prompt "Langwell APB Timer Support" if X86_MRST
+ def_bool y if X86_INTEL_MID
+ prompt "Intel MID APB Timer Support" if X86_INTEL_MID
select DW_APB_TIMER
depends on X86_INTEL_MID && SFI
help