Merge branch 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mv-sheeva.git] / drivers / char / pcmcia / Makefile

diff --git a/drivers/char/pcmcia/Makefile b/drivers/char/pcmcia/Makefile
index 35cd766a0a17b939008e7cf085986d7ad12b11ca..be8f287aa398f0a9697f9af30d4cda25b95ea1f0 100644 (file)
--- a/drivers/char/pcmcia/Makefile
+++ b/drivers/char/pcmcia/Makefile
@@ -4,5 +4,8 @@
 # Makefile for the Linux PCMCIA char device drivers.
 #
 
+obj-y += ipwireless/
+
 obj-$(CONFIG_SYNCLINK_CS) += synclink_cs.o
+obj-$(CONFIG_CARDMAN_4000) += cm4000_cs.o
 obj-$(CONFIG_CARDMAN_4040) += cm4040_cs.o