diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-13 11:05:49 (GMT) |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-13 11:05:49 (GMT) |
commit | 044e5f45e4ad890d03bd1e8bb44c634397cac24d (patch) | |
tree | a6063f77bd719d933823915d2273eaadb6331611 /drivers/pcmcia/Kconfig | |
parent | f0006314d37639714da9658cf4ff3f1f9f420764 (diff) | |
parent | faf64ed4968e354624f330c6da6c1ce8b05a0713 (diff) | |
download | linux-fsl-qoriq-044e5f45e4ad890d03bd1e8bb44c634397cac24d.tar.xz |
Merge branch 'pxa' into devel
Conflicts:
arch/arm/configs/em_x270_defconfig
arch/arm/configs/xm_x270_defconfig
Diffstat (limited to 'drivers/pcmcia/Kconfig')
-rw-r--r-- | drivers/pcmcia/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig index 1b0eb5a..86dd324c 100644 --- a/drivers/pcmcia/Kconfig +++ b/drivers/pcmcia/Kconfig @@ -219,7 +219,8 @@ config PCMCIA_SA1111 config PCMCIA_PXA2XX tristate "PXA2xx support" depends on ARM && ARCH_PXA && PCMCIA - depends on ARCH_LUBBOCK || MACH_MAINSTONE || PXA_SHARPSL || MACH_ARMCORE + depends on (ARCH_LUBBOCK || MACH_MAINSTONE || PXA_SHARPSL \ + || MACH_ARMCORE || ARCH_PXA_PALM) help Say Y here to include support for the PXA2xx PCMCIA controller |