Merge git://git.kernel.org/pub/scm/linux/kernel/git/jk/spufs

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / libertas / Makefile

diff --git a/drivers/net/wireless/libertas/Makefile b/drivers/net/wireless/libertas/Makefile
index a1097f59fd4667241e3a2331de83b9ec06dbb41a..f0724e31adfda477218a907af49dbcc573312da4 100644 (file)
--- a/drivers/net/wireless/libertas/Makefile
+++ b/drivers/net/wireless/libertas/Makefile
@@ -1,12 +1,15 @@
-libertas-objs := main.o fw.o wext.o \
+libertas-objs := main.o wext.o \
                rx.o tx.o cmd.o           \
                cmdresp.o scan.o          \
-               join.o 11d.o              \
-               ioctl.o debugfs.o         \
+               11d.o             \
+               debugfs.o         \
                ethtool.o assoc.o
 
-usb8xxx-objs += if_bootcmd.o
 usb8xxx-objs += if_usb.o
+libertas_cs-objs += if_cs.o
+libertas_sdio-objs += if_sdio.o
 
 obj-$(CONFIG_LIBERTAS)     += libertas.o
 obj-$(CONFIG_LIBERTAS_USB) += usb8xxx.o
+obj-$(CONFIG_LIBERTAS_CS)  += libertas_cs.o
+obj-$(CONFIG_LIBERTAS_SDIO) += libertas_sdio.o