aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2011-12-29 09:43:16 -0500
committerIngo Molnar <mingo@elte.hu>2011-12-29 15:53:17 -0500
commit7c9c3a1e5fc8728e948b8fa3cbcfcfb86db3afda (patch)
tree03b07665304989a2588ab144ead8aa7f57252646 /arch/x86/Kconfig
parent6e5ed276374c329b93a968d640f4d26c8c05411b (diff)
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/Kconfig8
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
409 depends on PCI 409 depends on PCI
410 depends on PCI_GOANY 410 depends on PCI_GOANY
411 depends on X86_IO_APIC 411 depends on X86_IO_APIC
412 select X86_INTEL_MID
413 select SFI
414 select DW_APB_TIMER
412 select APB_TIMER 415 select APB_TIMER
413 select I2C 416 select I2C
414 select SPI 417 select SPI
415 select INTEL_SCU_IPC 418 select INTEL_SCU_IPC
416 select X86_PLATFORM_DEVICES 419 select X86_PLATFORM_DEVICES
417 select X86_INTEL_MID
418 ---help--- 420 ---help---
419 Moorestown is Intel's Low Power Intel Architecture (LPIA) based Moblin 421 Moorestown is Intel's Low Power Intel Architecture (LPIA) based Moblin
420 Internet Device(MID) platform. Moorestown consists of two chips: 422 Internet Device(MID) platform. Moorestown consists of two chips:
@@ -428,12 +430,14 @@ config X86_MDFLD
428 depends on PCI 430 depends on PCI
429 depends on PCI_GOANY 431 depends on PCI_GOANY
430 depends on X86_IO_APIC 432 depends on X86_IO_APIC
433 select X86_INTEL_MID
434 select SFI
435 select DW_APB_TIMER
431 select APB_TIMER 436 select APB_TIMER
432 select I2C 437 select I2C
433 select SPI 438 select SPI
434 select INTEL_SCU_IPC 439 select INTEL_SCU_IPC
435 select X86_PLATFORM_DEVICES 440 select X86_PLATFORM_DEVICES
436 select X86_INTEL_MID
437 ---help--- 441 ---help---
438 Medfield is Intel's Low Power Intel Architecture (LPIA) based Moblin 442 Medfield is Intel's Low Power Intel Architecture (LPIA) based Moblin
439 Internet Device(MID) platform. 443 Internet Device(MID) platform.