summaryrefslogtreecommitdiff
path: root/drivers/pcmcia/Kconfig
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-10-07 22:08:32 +0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-10-07 22:08:32 +0400
commitcc513ac0f29473de365664c4fba9cf033c1f2324 (patch)
tree27ee53310699caa0e5cac80d519c0ec04120f8ca /drivers/pcmcia/Kconfig
parent1543966a079fc7065849ae43ca4dd767c188ad55 (diff)
parent19ec95df2c4ec2d28919f267c4d17178f8fe9d9c (diff)
downloadlinux-cc513ac0f29473de365664c4fba9cf033c1f2324.tar.xz
Merge branch 'viper-for-rmk' of git://www.misterjones.org/linux-2.6-arm
Merge branch 'pxa-viper' into pxa-machines Conflicts: arch/arm/mach-pxa/Makefile drivers/pcmcia/Kconfig drivers/pcmcia/Makefile
Diffstat (limited to 'drivers/pcmcia/Kconfig')
-rw-r--r--drivers/pcmcia/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index 40417d3fe50d..f57eeae3830a 100644
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -220,7 +220,8 @@ config PCMCIA_PXA2XX
tristate "PXA2xx support"
depends on ARM && ARCH_PXA && PCMCIA
depends on (ARCH_LUBBOCK || MACH_MAINSTONE || PXA_SHARPSL \
- || MACH_ARMCORE || ARCH_PXA_PALM || TRIZEPS_PCMCIA)
+ || MACH_ARMCORE || ARCH_PXA_PALM || TRIZEPS_PCMCIA \
+ || ARCH_VIPER)
help
Say Y here to include support for the PXA2xx PCMCIA controller