---

yaml --- r: 364151 b: refs/heads/master c: f33cb17 h: refs/heads/master i: 364149: e006bf1 364147: 8ef5511 364143: f3fe898 v: v3
git-mirror · Apr 19, 2013 · 977fe27 · 977fe27
1 parent d77f6cf
commit 977fe27
Show file tree

Hide file tree

Showing 10 changed files with 1 addition and 6,475 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f69915c728c3be41e12dbbbdd4eeb8d3388d58c
+refs/heads/master: f33cb17d1dd68d78accf46db96ced2dc7b4563c3
diff --git a/trunk/drivers/staging/Kconfig b/trunk/drivers/staging/Kconfig
@@ -110,8 +110,6 @@ source "drivers/staging/nvec/Kconfig"
 
 source "drivers/staging/media/Kconfig"
 
-source "drivers/staging/net/Kconfig"
-
 source "drivers/staging/android/Kconfig"
 
 source "drivers/staging/ozwpan/Kconfig"

diff --git a/trunk/drivers/staging/Makefile b/trunk/drivers/staging/Makefile
@@ -4,7 +4,6 @@
 obj-$(CONFIG_STAGING)		+= staging.o
 
 obj-y				+= media/
-obj-y				+= net/
 obj-$(CONFIG_ET131X)		+= et131x/
 obj-$(CONFIG_SLICOSS)		+= slicoss/
 obj-$(CONFIG_USBIP_CORE)	+= usbip/

diff --git a/trunk/drivers/staging/net/Kconfig b/trunk/drivers/staging/net/Kconfig
diff --git a/trunk/drivers/staging/net/Makefile b/trunk/drivers/staging/net/Makefile
diff --git a/trunk/drivers/staging/net/TODO b/trunk/drivers/staging/net/TODO