diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 16:33:02 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 16:33:02 -0400 |
| commit | 3f30a09a612bac2b531a206c2a58a292dd7ff182 (patch) | |
| tree | 62741c2f78aeb3009c66dbcf014ebff2e034e597 /drivers/pcmcia/Kconfig | |
| parent | 9e165acf1b9e37af7c0fa39399b43d0bd8600039 (diff) | |
| parent | fda50a1c49ad7483eaa29a268d560422c413933f (diff) | |
Merge branch 'pxa-all' into devel
Conflicts:
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/corgi.c
arch/arm/mach-pxa/include/mach/hardware.h
arch/arm/mach-pxa/spitz.c
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 e0f884034c9f..f57eeae3830a 100644 --- a/drivers/pcmcia/Kconfig +++ b/drivers/pcmcia/Kconfig | |||
| @@ -220,7 +220,8 @@ config PCMCIA_PXA2XX | |||
| 220 | tristate "PXA2xx support" | 220 | tristate "PXA2xx support" |
| 221 | depends on ARM && ARCH_PXA && PCMCIA | 221 | depends on ARM && ARCH_PXA && PCMCIA |
| 222 | depends on (ARCH_LUBBOCK || MACH_MAINSTONE || PXA_SHARPSL \ | 222 | depends on (ARCH_LUBBOCK || MACH_MAINSTONE || PXA_SHARPSL \ |
| 223 | || MACH_ARMCORE || ARCH_PXA_PALM) | 223 | || MACH_ARMCORE || ARCH_PXA_PALM || TRIZEPS_PCMCIA \ |
| 224 | || ARCH_VIPER) | ||
| 224 | help | 225 | help |
| 225 | Say Y here to include support for the PXA2xx PCMCIA controller | 226 | Say Y here to include support for the PXA2xx PCMCIA controller |
| 226 | 227 | ||