diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-07 20:08:32 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-07 20:08:32 +0200 |
| commit | cc513ac0f29473de365664c4fba9cf033c1f2324 (patch) | |
| tree | 27ee53310699caa0e5cac80d519c0ec04120f8ca /drivers/pcmcia/Makefile | |
| parent | Merge branch 'pxa-palm' into pxa-machines (diff) | |
| parent | Add default configuration for Arcom/Eurotech Viper SBC (diff) | |
| download | linux-cc513ac0f29473de365664c4fba9cf033c1f2324.tar.xz linux-cc513ac0f29473de365664c4fba9cf033c1f2324.zip | |
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/Makefile')
| -rw-r--r-- | drivers/pcmcia/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile index 679ca927a62a..8c2fe94122a2 100644 --- a/drivers/pcmcia/Makefile +++ b/drivers/pcmcia/Makefile @@ -72,7 +72,7 @@ pxa2xx_cs-$(CONFIG_ARCH_LUBBOCK) += pxa2xx_lubbock.o sa1111_generic.o pxa2xx_cs-$(CONFIG_MACH_MAINSTONE) += pxa2xx_mainstone.o pxa2xx_cs-$(CONFIG_PXA_SHARPSL) += pxa2xx_sharpsl.o pxa2xx_cs-$(CONFIG_MACH_ARMCORE) += pxa2xx_cm_x2xx.o pxa2xx_cm_x255.o pxa2xx_cm_x270.o +pxa2xx_cs-$(CONFIG_ARCH_VIPER) += pxa2xx_viper.o pxa2xx_cs-$(CONFIG_TRIZEPS_PCMCIA) += pxa2xx_trizeps.o pxa2xx_cs-$(CONFIG_MACH_PALMTX) += pxa2xx_palmtx.o pxa2xx_cs-$(CONFIG_MACH_PALMLD) += pxa2xx_palmld.o - |