Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: Staging: benet: remove driver now that it is merged in drivers/net/
xiaoqiangnk · Mar 18, 2009 · a1e4ee2 · a1e4ee2
2 parents 85bff88 + d0573fa
commit a1e4ee2
Show file tree

Hide file tree

Showing 39 changed files with 0 additions and 12,237 deletions.
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
@@ -73,8 +73,6 @@ source "drivers/staging/rt2860/Kconfig"
 
 source "drivers/staging/rt2870/Kconfig"
 
-source "drivers/staging/benet/Kconfig"
-
 source "drivers/staging/comedi/Kconfig"
 
 source "drivers/staging/asus_oled/Kconfig"

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
@@ -19,7 +19,6 @@ obj-$(CONFIG_AGNX)		+= agnx/
 obj-$(CONFIG_OTUS)		+= otus/
 obj-$(CONFIG_RT2860)		+= rt2860/
 obj-$(CONFIG_RT2870)		+= rt2870/
-obj-$(CONFIG_BENET)		+= benet/
 obj-$(CONFIG_COMEDI)		+= comedi/
 obj-$(CONFIG_ASUS_OLED)		+= asus_oled/
 obj-$(CONFIG_PANEL)		+= panel/

diff --git a/drivers/staging/benet/Kconfig b/drivers/staging/benet/Kconfig
diff --git a/drivers/staging/benet/MAINTAINERS b/drivers/staging/benet/MAINTAINERS
diff --git a/drivers/staging/benet/Makefile b/drivers/staging/benet/Makefile
diff --git a/drivers/staging/benet/TODO b/drivers/staging/benet/TODO
diff --git a/drivers/staging/benet/asyncmesg.h b/drivers/staging/benet/asyncmesg.h
diff --git a/drivers/staging/benet/be_cm.h b/drivers/staging/benet/be_cm.h
diff --git a/drivers/staging/benet/be_common.h b/drivers/staging/benet/be_common.h