diff options
| author | Alan Cox | 2011-12-29 15:43:16 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2011-12-29 21:53:17 +0100 |
| commit | 7c9c3a1e5fc8728e948b8fa3cbcfcfb86db3afda (patch) | |
| tree | 03b07665304989a2588ab144ead8aa7f57252646 /arch/x86/Kconfig | |
| parent | Merge commit 'v3.2-rc6' into x86/platform (diff) | |
| download | kernel-qcow2-linux-7c9c3a1e5fc8728e948b8fa3cbcfcfb86db3afda.tar.gz kernel-qcow2-linux-7c9c3a1e5fc8728e948b8fa3cbcfcfb86db3afda.tar.xz kernel-qcow2-linux-7c9c3a1e5fc8728e948b8fa3cbcfcfb86db3afda.zip | |
x86/intel config: Fix the APB_TIMER selection
Seems Kconfig SELECT isn't selecting things hierarchically when
selected.
config APB_TIMER
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
when we select APB_TIMER doesn't select DW_APB_TIMER so do it by
hand.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Link: http://lkml.kernel.org/n/tip-kpnaimplltk6d1lolusqj3ae@git.kernel.org
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 07620bc913db..78fbb346959b 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -409,12 +409,14 @@ config X86_MRST depends on PCI depends on PCI_GOANY depends on X86_IO_APIC + select X86_INTEL_MID + select SFI + select DW_APB_TIMER select APB_TIMER select I2C select SPI select INTEL_SCU_IPC select X86_PLATFORM_DEVICES - select X86_INTEL_MID ---help--- Moorestown is Intel's Low Power Intel Architecture (LPIA) based Moblin Internet Device(MID) platform. Moorestown consists of two chips: @@ -428,12 +430,14 @@ config X86_MDFLD depends on PCI depends on PCI_GOANY depends on X86_IO_APIC + select X86_INTEL_MID + select SFI + select DW_APB_TIMER select APB_TIMER select I2C select SPI select INTEL_SCU_IPC select X86_PLATFORM_DEVICES - select X86_INTEL_MID ---help--- Medfield is Intel's Low Power Intel Architecture (LPIA) based Moblin Internet Device(MID) platform. |