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>

diff --git a/drivers/staging/benet/Makefile b/drivers/staging/benet/Makefile
index 58c050d..460b923 100644 (file)
--- 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 54cd90e..e8d5b64 100644 (file)
--- 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
similarity index 100%
rename from drivers/staging/benet/fw/asyncmesg.h
rename to drivers/staging/benet/asyncmesg.h

diff --git a/drivers/staging/benet/fw/be_cm.h b/drivers/staging/benet/be_cm.h
similarity index 100%
rename from drivers/staging/benet/fw/be_cm.h
rename to drivers/staging/benet/be_cm.h

diff --git a/drivers/staging/benet/fw/be_common.h b/drivers/staging/benet/be_common.h
similarity index 100%
rename from drivers/staging/benet/fw/be_common.h
rename to drivers/staging/benet/be_common.h

diff --git a/drivers/staging/benet/hwlib/bestatus.h b/drivers/staging/benet/bestatus.h
similarity index 100%
rename from drivers/staging/benet/hwlib/bestatus.h
rename to drivers/staging/benet/bestatus.h

diff --git a/drivers/staging/benet/fw/cev.h b/drivers/staging/benet/cev.h
similarity index 100%
rename from drivers/staging/benet/fw/cev.h
rename to drivers/staging/benet/cev.h

diff --git a/drivers/staging/benet/hwlib/cq.c b/drivers/staging/benet/cq.c
similarity index 100%
rename from drivers/staging/benet/hwlib/cq.c
rename to drivers/staging/benet/cq.c

diff --git a/drivers/staging/benet/fw/descriptors.h b/drivers/staging/benet/descriptors.h
similarity index 100%
rename from drivers/staging/benet/fw/descriptors.h
rename to drivers/staging/benet/descriptors.h

diff --git a/drivers/staging/benet/fw/doorbells.h b/drivers/staging/benet/doorbells.h
similarity index 100%
rename from drivers/staging/benet/fw/doorbells.h
rename to drivers/staging/benet/doorbells.h

diff --git a/drivers/staging/benet/fw/ep.h b/drivers/staging/benet/ep.h
similarity index 100%
rename from drivers/staging/benet/fw/ep.h
rename to drivers/staging/benet/ep.h

diff --git a/drivers/staging/benet/hwlib/eq.c b/drivers/staging/benet/eq.c
similarity index 100%
rename from drivers/staging/benet/hwlib/eq.c
rename to drivers/staging/benet/eq.c

diff --git a/drivers/staging/benet/hwlib/eth.c b/drivers/staging/benet/eth.c
similarity index 100%
rename from drivers/staging/benet/hwlib/eth.c
rename to drivers/staging/benet/eth.c

diff --git a/drivers/staging/benet/fw/etx_context.h b/drivers/staging/benet/etx_context.h
similarity index 100%
rename from drivers/staging/benet/fw/etx_context.h
rename to drivers/staging/benet/etx_context.h

diff --git a/drivers/staging/benet/hwlib/funcobj.c b/drivers/staging/benet/funcobj.c
similarity index 100%
rename from drivers/staging/benet/hwlib/funcobj.c
rename to drivers/staging/benet/funcobj.c

diff --git a/drivers/staging/benet/fw/fwcmd_common.h b/drivers/staging/benet/fwcmd_common.h
similarity index 100%
rename from drivers/staging/benet/fw/fwcmd_common.h
rename to 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
similarity index 100%
rename from drivers/staging/benet/fw/fwcmd_common_bmap.h
rename to 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
similarity index 100%
rename from drivers/staging/benet/fw/fwcmd_eth_bmap.h
rename to 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
similarity index 100%
rename from drivers/staging/benet/fw/fwcmd_hdr_bmap.h
rename to drivers/staging/benet/fwcmd_hdr_bmap.h

diff --git a/drivers/staging/benet/fw/fwcmd_mcc.h b/drivers/staging/benet/fwcmd_mcc.h
similarity index 100%
rename from drivers/staging/benet/fw/fwcmd_mcc.h
rename to drivers/staging/benet/fwcmd_mcc.h

diff --git a/drivers/staging/benet/fw/fwcmd_opcodes.h b/drivers/staging/benet/fwcmd_opcodes.h
similarity index 100%
rename from drivers/staging/benet/fw/fwcmd_opcodes.h
rename to 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
similarity index 100%
rename from drivers/staging/benet/fw/fwcmd_types_bmap.h
rename to drivers/staging/benet/fwcmd_types_bmap.h

diff --git a/drivers/staging/benet/fw/host_struct.h b/drivers/staging/benet/host_struct.h
similarity index 100%
rename from drivers/staging/benet/fw/host_struct.h
rename to drivers/staging/benet/host_struct.h

diff --git a/drivers/staging/benet/hwlib/hwlib.h b/drivers/staging/benet/hwlib.h
similarity index 100%
rename from drivers/staging/benet/hwlib/hwlib.h
rename to drivers/staging/benet/hwlib.h

diff --git a/drivers/staging/benet/hwlib/mpu.c b/drivers/staging/benet/mpu.c
similarity index 100%
rename from drivers/staging/benet/hwlib/mpu.c
rename to drivers/staging/benet/mpu.c

diff --git a/drivers/staging/benet/fw/mpu.h b/drivers/staging/benet/mpu.h
similarity index 100%
rename from drivers/staging/benet/fw/mpu.h
rename to drivers/staging/benet/mpu.h

diff --git a/drivers/staging/benet/fw/mpu_context.h b/drivers/staging/benet/mpu_context.h
similarity index 100%
rename from drivers/staging/benet/fw/mpu_context.h
rename to drivers/staging/benet/mpu_context.h

diff --git a/drivers/staging/benet/fw/pcicfg.h b/drivers/staging/benet/pcicfg.h
similarity index 100%
rename from drivers/staging/benet/fw/pcicfg.h
rename to drivers/staging/benet/pcicfg.h

diff --git a/drivers/staging/benet/fw/post_codes.h b/drivers/staging/benet/post_codes.h
similarity index 100%
rename from drivers/staging/benet/fw/post_codes.h
rename to drivers/staging/benet/post_codes.h

diff --git a/drivers/staging/benet/fw/regmap.h b/drivers/staging/benet/regmap.h
similarity index 100%
rename from drivers/staging/benet/fw/regmap.h
rename to drivers/staging/benet/regmap.h