---

yaml --- r: 66466 b: refs/heads/master c: 27590d0 h: refs/heads/master v: v3
git-mirror · Oct 10, 2007 · 1eb8a21 · 1eb8a21
1 parent 1fb3bdb
commit 1eb8a21
Show file tree

Hide file tree

Showing 4 changed files with 1,015 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9cdc6d295b97dc4a36569ddd0b0540aeba351149
+refs/heads/master: 27590d06e136167101c8c6347e7c2885c7f014b9
diff --git a/trunk/drivers/net/wireless/Kconfig b/trunk/drivers/net/wireless/Kconfig
@@ -275,6 +275,13 @@ config LIBERTAS_USB
 	---help---
 	  A driver for Marvell Libertas 8388 USB devices.
 
+config LIBERTAS_CS
+	tristate "Marvell Libertas 8385 CompactFlash 802.11b/g cards"
+	depends on LIBERTAS && PCMCIA && EXPERIMENTAL
+	select FW_LOADER
+	---help---
+	  A driver for Marvell Libertas 8385 CompactFlash devices.
+
 config LIBERTAS_DEBUG
 	bool "Enable full debugging output in the Libertas module."
 	depends on LIBERTAS

diff --git a/trunk/drivers/net/wireless/libertas/Makefile b/trunk/drivers/net/wireless/libertas/Makefile
@@ -6,6 +6,8 @@ libertas-objs := main.o wext.o \
 		ethtool.o assoc.o
 
 usb8xxx-objs += if_usb.o
+libertas_cs-objs += if_cs.o
 
 obj-$(CONFIG_LIBERTAS)     += libertas.o
 obj-$(CONFIG_LIBERTAS_USB) += usb8xxx.o
+obj-$(CONFIG_LIBERTAS_CS)  += libertas_cs.o