aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2011-12-05 18:14:39 -0500
committerIngo Molnar <mingo@elte.hu>2011-12-06 05:28:36 -0500
commitdd13752537d36cc6c145cb040f71ce7acda31e6e (patch)
treea3066fe1cb68fc536f972844ca30d661fa21a4db /arch
parent45e713efe2fa574b6662e7fb63fae9497c5e03d4 (diff)
x86/intel_mid: Fix the Kconfig for MID selection
We currently fail to build on CONFIG_X86_INTEL_MID=y and CONFIG_X86_MRST unset. We could build all the bits to make generic MID work if you picked MID platform alone but that's really silly. Instead use select and two variables. This looks a bit daft right now but once we add a Medfield selection it'll start to look a good deal more sensible. Reported-by: Ingo Molnar <mingo@elte.hu> Reported-by: Stanislaw Gruszka <sgruszka@redhat.com> Signed-off-by: Alan Cox <alan@linux.intel.com> Link: http://lkml.kernel.org/r/20111205231433.28811.51297.stgit@bob.linux.org.uk Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/Kconfig5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index cb9a1044a771..5553f9f1a70d 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -390,7 +390,7 @@ config X86_INTEL_CE
390 This option compiles in support for the CE4100 SOC for settop 390 This option compiles in support for the CE4100 SOC for settop
391 boxes and media devices. 391 boxes and media devices.
392 392
393config X86_INTEL_MID 393config X86_WANT_INTEL_MID
394 bool "Intel MID platform support" 394 bool "Intel MID platform support"
395 depends on X86_32 395 depends on X86_32
396 depends on X86_EXTENDED_PLATFORM 396 depends on X86_EXTENDED_PLATFORM
@@ -399,7 +399,7 @@ config X86_INTEL_MID
399 systems which do not have the PCI legacy interfaces (Moorestown, 399 systems which do not have the PCI legacy interfaces (Moorestown,
400 Medfield). If you are building for a PC class system say N here. 400 Medfield). If you are building for a PC class system say N here.
401 401
402if X86_INTEL_MID 402if X86_WANT_INTEL_MID
403 403
404config X86_MRST 404config X86_MRST
405 bool "Moorestown MID platform" 405 bool "Moorestown MID platform"
@@ -411,6 +411,7 @@ config X86_MRST
411 select SPI 411 select SPI
412 select INTEL_SCU_IPC 412 select INTEL_SCU_IPC
413 select X86_PLATFORM_DEVICES 413 select X86_PLATFORM_DEVICES
414 select X86_INTEL_MID
414 ---help--- 415 ---help---
415 Moorestown is Intel's Low Power Intel Architecture (LPIA) based Moblin 416 Moorestown is Intel's Low Power Intel Architecture (LPIA) based Moblin
416 Internet Device(MID) platform. Moorestown consists of two chips: 417 Internet Device(MID) platform. Moorestown consists of two chips: