diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-07 19:06:52 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-07 19:06:52 +0100 |
| commit | 5ff7f78a3db462ea4edf1a781a2002d4e8a8a473 (patch) | |
| tree | fc0516369f4146595c5dce9bddda23d8691c3f42 /drivers/pcmcia/Kconfig | |
| parent | 35437b6192d9a4eb92f095dfd72396b6d2970f0b (diff) | |
| parent | 92b797f6a1347623a41caf02516b70e5fa706a90 (diff) | |
Merge branch 'pxa-trizeps' into pxa-machines
Conflicts:
drivers/pcmcia/Makefile
Diffstat (limited to 'drivers/pcmcia/Kconfig')
| -rw-r--r-- | drivers/pcmcia/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig index e0f884034c9..40417d3fe50 100644 --- a/drivers/pcmcia/Kconfig +++ b/drivers/pcmcia/Kconfig @@ -220,7 +220,7 @@ 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) + || MACH_ARMCORE || ARCH_PXA_PALM || TRIZEPS_PCMCIA) help Say Y here to include support for the PXA2xx PCMCIA controller |