aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-03-13 11:54:26 -0400
committerArnd Bergmann <arnd@arndb.de>2014-03-21 13:26:06 -0400
commitedd4c7208b94efebe579171bfc2253362fc8193a (patch)
tree3722e1d322d47c21717f831b37b90dab96339dfe
parentc7dc7d49fa8cddcc1907f94c658989583728099f (diff)
ARM: pxa: trizeps4 and trizeps4wl use the same file
The trizeps4 and trizeps4wl platforms are both implemented using the same board file. Since the trizeps4wl code is a superset of trizeps4, it makes no sense to enable just the latter, but with the current Kconfig logic, it causes the board file not to be built at all. Selecting MACH_TRIZEPS4 from MACH_TRIZEPS4WL ensures that we are actually building the board file. Found during randconfig testing. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Eric Miao <eric.y.miao@gmail.com> Cc: Russell King <linux@arm.linux.org.uk> Cc: Haojian Zhuang <haojian.zhuang@gmail.com> Cc: Daniel Mack <zonque@gmail.com>
-rw-r--r--arch/arm/mach-pxa/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 6963dee61e19..a280cc42636b 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -183,6 +183,7 @@ config MACH_TRIZEPS4
183config MACH_TRIZEPS4WL 183config MACH_TRIZEPS4WL
184 bool "Keith und Koep Trizeps4-WL DIMM-Module" 184 bool "Keith und Koep Trizeps4-WL DIMM-Module"
185 depends on TRIZEPS_PXA 185 depends on TRIZEPS_PXA
186 select MACH_TRIZEPS4
186 select PXA27x 187 select PXA27x
187 select TRIZEPS_PCMCIA 188 select TRIZEPS_PCMCIA
188 189