Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1e4ee22 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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/
parents 85bff885 d0573fac

drivers/staging/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -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"

drivers/staging/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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/

drivers/staging/benet/Kconfig

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
config BENET

	tristate "ServerEngines 10Gb NIC - BladeEngine"

	depends on PCI && INET

	select INET_LRO

	help

	  This driver implements the NIC functionality for ServerEngines

	  10Gb network adapter BladeEngine (EC 3210).

drivers/staging/benet/MAINTAINERS

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
SERVER ENGINES 10Gbe NIC - BLADE-ENGINE

P:	Subbu Seetharaman

M:	subbus@serverengines.com

L:	netdev@vger.kernel.org

W:	http://www.serverengines.com

S:	Supported

drivers/staging/benet/Makefile

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
#

# Makefile to build the network driver for ServerEngine's BladeEngine

#

obj-$(CONFIG_BENET) += benet.o



benet-y :=  be_init.o \

			be_int.o \

			be_netif.o \

			be_ethtool.o \

			funcobj.o \

			cq.o \

			eq.o \

			mpu.o \

			eth.o