---

yaml --- r: 220017 b: refs/heads/master c: cff55f5 h: refs/heads/master i: 220015: e95e801 v: v3
git-mirror · Oct 2, 2010 · b7f1893 · b7f1893
1 parent 13b7792
commit b7f1893
Show file tree

Hide file tree

Showing 80 changed files with 1 addition and 69,596 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0656bb352080982f960bfff2b78602a5071c909f
+refs/heads/master: cff55f50b882b197a52c4cf0108a43c615d1fdba
diff --git a/trunk/drivers/staging/Kconfig b/trunk/drivers/staging/Kconfig
@@ -59,8 +59,6 @@ source "drivers/staging/wlan-ng/Kconfig"
 
 source "drivers/staging/echo/Kconfig"
 
-source "drivers/staging/otus/Kconfig"
-
 source "drivers/staging/brcm80211/Kconfig"
 
 source "drivers/staging/rt2860/Kconfig"

diff --git a/trunk/drivers/staging/Makefile b/trunk/drivers/staging/Makefile
@@ -13,7 +13,6 @@ obj-$(CONFIG_USB_IP_COMMON)	+= usbip/
 obj-$(CONFIG_W35UND)		+= winbond/
 obj-$(CONFIG_PRISM2_USB)	+= wlan-ng/
 obj-$(CONFIG_ECHO)		+= echo/
-obj-$(CONFIG_OTUS)		+= otus/
 obj-$(CONFIG_BRCM80211)		+= brcm80211/
 obj-$(CONFIG_RT2860)		+= rt2860/
 obj-$(CONFIG_RT2870)		+= rt2870/

diff --git a/trunk/drivers/staging/otus/80211core/amsdu.c b/trunk/drivers/staging/otus/80211core/amsdu.c