Staging: benet: patch to remove subdirectories

Here's a patch tp remove the subdirectories in staging/benet (1st item in
staging/benet/TODO).

Signed-off-by: Sathya Perla <sathyap@serverengines.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

30 files changed, 10 insertions, 6 deletions

diff --git a/drivers/staging/benet/Makefile b/drivers/staging/benet/Makefile
index 58c050dd0f5..460b923b99b 100644
--- a/drivers/staging/benet/Makefile
+++ b/drivers/staging/benet/Makefile
@@ -1,9 +1,14 @@
 #
-# Makefile to build the network driver for ServerEngine's BladeEngine.
+# Makefile to build the network driver for ServerEngine's BladeEngine
 #
-EXTRA_CFLAGS = -I$(src)/hwlib -I$(src)/fw
-
 obj-$(CONFIG_BENET) += benet.o
 
-benet-y :=  be_init.o be_int.o be_netif.o be_ethtool.o \
-	hwlib/funcobj.o hwlib/cq.o hwlib/eq.o hwlib/mpu.o hwlib/eth.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
diff --git a/drivers/staging/benet/TODO b/drivers/staging/benet/TODO
index 54cd90e2e07..e8d5b6463f4 100644
--- a/drivers/staging/benet/TODO
+++ b/drivers/staging/benet/TODO
@@ -1,5 +1,4 @@
 TODO:
-	- remove subdirectories
 	- fix minor checkpatch.pl issues
 	- remove wrappers around common iowrite functions
 	- full netdev audit of common problems/issues
diff --git a/drivers/staging/benet/fw/asyncmesg.h b/drivers/staging/benet/asyncmesg.h
index b47c9a5b1d6..b47c9a5b1d6 100644
--- a/drivers/staging/benet/fw/asyncmesg.h
+++ b/drivers/staging/benet/asyncmesg.h
diff --git a/drivers/staging/benet/fw/be_cm.h b/drivers/staging/benet/be_cm.h
index b7a1dfd20c3..b7a1dfd20c3 100644
--- a/drivers/staging/benet/fw/be_cm.h
+++ b/drivers/staging/benet/be_cm.h
diff --git a/drivers/staging/benet/fw/be_common.h b/drivers/staging/benet/be_common.h
index 7e63dc5e334..7e63dc5e334 100644
--- a/drivers/staging/benet/fw/be_common.h
+++ b/drivers/staging/benet/be_common.h
diff --git a/drivers/staging/benet/hwlib/bestatus.h b/drivers/staging/benet/bestatus.h
index 59c7a4b6222..59c7a4b6222 100644
--- a/drivers/staging/benet/hwlib/bestatus.h
+++ b/drivers/staging/benet/bestatus.h
diff --git a/drivers/staging/benet/fw/cev.h b/drivers/staging/benet/cev.h
index 30996920a54..30996920a54 100644
--- a/drivers/staging/benet/fw/cev.h
+++ b/drivers/staging/benet/cev.h
diff --git a/drivers/staging/benet/hwlib/cq.c b/drivers/staging/benet/cq.c
index 65045864543..65045864543 100644
--- a/drivers/staging/benet/hwlib/cq.c
+++ b/drivers/staging/benet/cq.c
diff --git a/drivers/staging/benet/fw/descriptors.h b/drivers/staging/benet/descriptors.h
index 8da438c407d..8da438c407d 100644
--- a/drivers/staging/benet/fw/descriptors.h
+++ b/drivers/staging/benet/descriptors.h
diff --git a/drivers/staging/benet/fw/doorbells.h b/drivers/staging/benet/doorbells.h
index 550cc4d5d6f..550cc4d5d6f 100644
--- a/drivers/staging/benet/fw/doorbells.h
+++ b/drivers/staging/benet/doorbells.h
diff --git a/drivers/staging/benet/fw/ep.h b/drivers/staging/benet/ep.h
index 72fcf64a9ff..72fcf64a9ff 100644
--- a/drivers/staging/benet/fw/ep.h
+++ b/drivers/staging/benet/ep.h
diff --git a/drivers/staging/benet/hwlib/eq.c b/drivers/staging/benet/eq.c
index db92ccd8fed..db92ccd8fed 100644
--- a/drivers/staging/benet/hwlib/eq.c
+++ b/drivers/staging/benet/eq.c
diff --git a/drivers/staging/benet/hwlib/eth.c b/drivers/staging/benet/eth.c
index f641b6260d0..f641b6260d0 100644
--- a/drivers/staging/benet/hwlib/eth.c
+++ b/drivers/staging/benet/eth.c
diff --git a/drivers/staging/benet/fw/etx_context.h b/drivers/staging/benet/etx_context.h
index 554fbe5d127..554fbe5d127 100644
--- a/drivers/staging/benet/fw/etx_context.h
+++ b/drivers/staging/benet/etx_context.h
diff --git a/drivers/staging/benet/hwlib/funcobj.c b/drivers/staging/benet/funcobj.c
index 6eabe96e14c..6eabe96e14c 100644
--- a/drivers/staging/benet/hwlib/funcobj.c
+++ b/drivers/staging/benet/funcobj.c
diff --git a/drivers/staging/benet/fw/fwcmd_common.h b/drivers/staging/benet/fwcmd_common.h
index 406e0d6fa98..406e0d6fa98 100644
--- a/drivers/staging/benet/fw/fwcmd_common.h
+++ b/drivers/staging/benet/fwcmd_common.h
diff --git a/drivers/staging/benet/fw/fwcmd_common_bmap.h b/drivers/staging/benet/fwcmd_common_bmap.h
index a007cf27650..a007cf27650 100644
--- a/drivers/staging/benet/fw/fwcmd_common_bmap.h
+++ b/drivers/staging/benet/fwcmd_common_bmap.h
diff --git a/drivers/staging/benet/fw/fwcmd_eth_bmap.h b/drivers/staging/benet/fwcmd_eth_bmap.h
index 234b179eace..234b179eace 100644
--- a/drivers/staging/benet/fw/fwcmd_eth_bmap.h
+++ b/drivers/staging/benet/fwcmd_eth_bmap.h
diff --git a/drivers/staging/benet/fw/fwcmd_hdr_bmap.h b/drivers/staging/benet/fwcmd_hdr_bmap.h
index 28b45328fe7..28b45328fe7 100644
--- a/drivers/staging/benet/fw/fwcmd_hdr_bmap.h
+++ b/drivers/staging/benet/fwcmd_hdr_bmap.h
diff --git a/drivers/staging/benet/fw/fwcmd_mcc.h b/drivers/staging/benet/fwcmd_mcc.h
index 9eeca878c1f..9eeca878c1f 100644
--- a/drivers/staging/benet/fw/fwcmd_mcc.h
+++ b/drivers/staging/benet/fwcmd_mcc.h
diff --git a/drivers/staging/benet/fw/fwcmd_opcodes.h b/drivers/staging/benet/fwcmd_opcodes.h
index 23d569386b4..23d569386b4 100644
--- a/drivers/staging/benet/fw/fwcmd_opcodes.h
+++ b/drivers/staging/benet/fwcmd_opcodes.h
diff --git a/drivers/staging/benet/fw/fwcmd_types_bmap.h b/drivers/staging/benet/fwcmd_types_bmap.h
index 92217aff3a1..92217aff3a1 100644
--- a/drivers/staging/benet/fw/fwcmd_types_bmap.h
+++ b/drivers/staging/benet/fwcmd_types_bmap.h
diff --git a/drivers/staging/benet/fw/host_struct.h b/drivers/staging/benet/host_struct.h
index 3de6722b980..3de6722b980 100644
--- a/drivers/staging/benet/fw/host_struct.h
+++ b/drivers/staging/benet/host_struct.h
diff --git a/drivers/staging/benet/hwlib/hwlib.h b/drivers/staging/benet/hwlib.h
index 0cffe8fe774..0cffe8fe774 100644
--- a/drivers/staging/benet/hwlib/hwlib.h
+++ b/drivers/staging/benet/hwlib.h
diff --git a/drivers/staging/benet/hwlib/mpu.c b/drivers/staging/benet/mpu.c
index bec8dc9f173..bec8dc9f173 100644
--- a/drivers/staging/benet/hwlib/mpu.c
+++ b/drivers/staging/benet/mpu.c
diff --git a/drivers/staging/benet/fw/mpu.h b/drivers/staging/benet/mpu.h
index 41f3f87516e..41f3f87516e 100644
--- a/drivers/staging/benet/fw/mpu.h
+++ b/drivers/staging/benet/mpu.h
diff --git a/drivers/staging/benet/fw/mpu_context.h b/drivers/staging/benet/mpu_context.h
index 8ce90f9c46c..8ce90f9c46c 100644
--- a/drivers/staging/benet/fw/mpu_context.h
+++ b/drivers/staging/benet/mpu_context.h
diff --git a/drivers/staging/benet/fw/pcicfg.h b/drivers/staging/benet/pcicfg.h
index 7c15684adf4..7c15684adf4 100644
--- a/drivers/staging/benet/fw/pcicfg.h
+++ b/drivers/staging/benet/pcicfg.h
diff --git a/drivers/staging/benet/fw/post_codes.h b/drivers/staging/benet/post_codes.h
index 6d1621f5f5f..6d1621f5f5f 100644
--- a/drivers/staging/benet/fw/post_codes.h
+++ b/drivers/staging/benet/post_codes.h
diff --git a/drivers/staging/benet/fw/regmap.h b/drivers/staging/benet/regmap.h
index e816ba210e8..e816ba210e8 100644
--- a/drivers/staging/benet/fw/regmap.h
+++ b/drivers/staging/benet/regmap.h