Merge branches 'release' and 'gpe-ack' into release

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

diff --git a/drivers/char/pcmcia/Makefile b/drivers/char/pcmcia/Makefile
index 1fcd4c591958043cbb653efd4f35bfb8dd45ebcc..0aae20985d5732059700e7fb50dec7d6573682a2 100644 (file)
--- a/drivers/char/pcmcia/Makefile
+++ b/drivers/char/pcmcia/Makefile
@@ -5,3 +5,5 @@
 #
 
 obj-$(CONFIG_SYNCLINK_CS) += synclink_cs.o
+obj-$(CONFIG_CARDMAN_4000) += cm4000_cs.o
+obj-$(CONFIG_CARDMAN_4040) += cm4040_cs.o