diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-07 18:08:32 (GMT) |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-07 18:08:32 (GMT) |
commit | cc513ac0f29473de365664c4fba9cf033c1f2324 (patch) | |
tree | 27ee53310699caa0e5cac80d519c0ec04120f8ca /drivers/pcmcia/Makefile | |
parent | 1543966a079fc7065849ae43ca4dd767c188ad55 (diff) | |
parent | 19ec95df2c4ec2d28919f267c4d17178f8fe9d9c (diff) | |
download | linux-fsl-qoriq-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/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 679ca92..8c2fe94 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 - |