Merge branch 'pxa-trizeps' into pxa-machines

[linux-2.6-omap-h63xx.git] / drivers / pcmcia / Makefile

diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile
index 749dff209d349d75246493df736acf5d3d85f483..20c5b06790a5261695808a8583c8a3b9ca6e8de5 100644 (file)
--- a/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@ -72,5 +72,6 @@ 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_TRIZEPS_PCMCIA)             += pxa2xx_trizeps.o
 pxa2xx_cs-$(CONFIG_MACH_PALMTX)                += pxa2xx_palmtx.o