Staging: benet: remove driver now that it is merged in drivers/net/
authorGreg Kroah-Hartman <gregkh@suse.de>
Wed, 18 Mar 2009 16:22:17 +0000 (09:22 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 18 Mar 2009 16:22:17 +0000 (09:22 -0700)
The benet driver is now in the proper place in drivers/net/benet, so we
can remove the staging version.

Acked-by: Sathya Perla <sathyap@serverengines.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
39 files changed:
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/benet/Kconfig [deleted file]
drivers/staging/benet/MAINTAINERS [deleted file]
drivers/staging/benet/Makefile [deleted file]
drivers/staging/benet/TODO [deleted file]
drivers/staging/benet/asyncmesg.h [deleted file]
drivers/staging/benet/be_cm.h [deleted file]
drivers/staging/benet/be_common.h [deleted file]
drivers/staging/benet/be_ethtool.c [deleted file]
drivers/staging/benet/be_init.c [deleted file]
drivers/staging/benet/be_int.c [deleted file]
drivers/staging/benet/be_netif.c [deleted file]
drivers/staging/benet/benet.h [deleted file]
drivers/staging/benet/bestatus.h [deleted file]
drivers/staging/benet/cev.h [deleted file]
drivers/staging/benet/cq.c [deleted file]
drivers/staging/benet/descriptors.h [deleted file]
drivers/staging/benet/doorbells.h [deleted file]
drivers/staging/benet/ep.h [deleted file]
drivers/staging/benet/eq.c [deleted file]
drivers/staging/benet/eth.c [deleted file]
drivers/staging/benet/etx_context.h [deleted file]
drivers/staging/benet/funcobj.c [deleted file]
drivers/staging/benet/fwcmd_common.h [deleted file]
drivers/staging/benet/fwcmd_common_bmap.h [deleted file]
drivers/staging/benet/fwcmd_eth_bmap.h [deleted file]
drivers/staging/benet/fwcmd_hdr_bmap.h [deleted file]
drivers/staging/benet/fwcmd_mcc.h [deleted file]
drivers/staging/benet/fwcmd_opcodes.h [deleted file]
drivers/staging/benet/fwcmd_types_bmap.h [deleted file]
drivers/staging/benet/host_struct.h [deleted file]
drivers/staging/benet/hwlib.h [deleted file]
drivers/staging/benet/mpu.c [deleted file]
drivers/staging/benet/mpu.h [deleted file]
drivers/staging/benet/mpu_context.h [deleted file]
drivers/staging/benet/pcicfg.h [deleted file]
drivers/staging/benet/post_codes.h [deleted file]
drivers/staging/benet/regmap.h [deleted file]

Simple merge
Simple merge
diff --cc drivers/staging/benet/Kconfig
Simple merge
diff --cc drivers/staging/benet/MAINTAINERS
Simple merge
diff --cc drivers/staging/benet/Makefile
Simple merge
diff --cc drivers/staging/benet/TODO
Simple merge
diff --cc drivers/staging/benet/asyncmesg.h
Simple merge
diff --cc drivers/staging/benet/be_cm.h
Simple merge
diff --cc drivers/staging/benet/be_common.h
Simple merge
diff --cc drivers/staging/benet/be_ethtool.c
Simple merge
diff --cc drivers/staging/benet/be_init.c
Simple merge
diff --cc drivers/staging/benet/be_int.c
Simple merge
diff --cc drivers/staging/benet/be_netif.c
Simple merge
diff --cc drivers/staging/benet/benet.h
Simple merge
diff --cc drivers/staging/benet/bestatus.h
Simple merge
diff --cc drivers/staging/benet/cev.h
Simple merge
diff --cc drivers/staging/benet/cq.c
Simple merge
diff --cc drivers/staging/benet/descriptors.h
Simple merge
diff --cc drivers/staging/benet/doorbells.h
Simple merge
diff --cc drivers/staging/benet/ep.h
Simple merge
diff --cc drivers/staging/benet/eq.c
Simple merge
diff --cc drivers/staging/benet/eth.c
Simple merge
diff --cc drivers/staging/benet/etx_context.h
Simple merge
diff --cc drivers/staging/benet/funcobj.c
Simple merge
diff --cc drivers/staging/benet/fwcmd_common.h
Simple merge
diff --cc drivers/staging/benet/fwcmd_common_bmap.h
Simple merge
diff --cc drivers/staging/benet/fwcmd_eth_bmap.h
Simple merge
diff --cc drivers/staging/benet/fwcmd_hdr_bmap.h
Simple merge
diff --cc drivers/staging/benet/fwcmd_mcc.h
Simple merge
diff --cc drivers/staging/benet/fwcmd_opcodes.h
Simple merge
diff --cc drivers/staging/benet/fwcmd_types_bmap.h
Simple merge
diff --cc drivers/staging/benet/host_struct.h
Simple merge
diff --cc drivers/staging/benet/hwlib.h
Simple merge
diff --cc drivers/staging/benet/mpu.c
Simple merge
diff --cc drivers/staging/benet/mpu.h
Simple merge
diff --cc drivers/staging/benet/mpu_context.h
Simple merge
diff --cc drivers/staging/benet/pcicfg.h
Simple merge
diff --cc drivers/staging/benet/post_codes.h
Simple merge
diff --cc drivers/staging/benet/regmap.h
Simple merge