Skip to contentSkip to conversation

STAGING patch for 2.6-git

PATCH New Greg KH 1 participant 1 message Mar 18, 2009

lore
Share & tools
lore

Greg KH

author
#0 lore raw

PATCH 1/1 STAGING patch for 2.6-git

Here is one staging patch. Now that the benet network driver is in the main drivers/net/ directory, the staging version of the driver should be removed from the tree. This patch does that, and was acked by the benet driver author.

Please pull from:
master.kernel.org:/pub/scm/linux/kernel/git/gregkh/staging-2.6.git/

thanks,

greg k-h

--------------

 drivers/staging/Kconfig                   |    2 -
 drivers/staging/Makefile                  |    1 -
 drivers/staging/benet/Kconfig             |    7 -
 drivers/staging/benet/MAINTAINERS         |    6 -
 drivers/staging/benet/Makefile            |   14 -
 drivers/staging/benet/TODO                |    6 -
 drivers/staging/benet/asyncmesg.h         |   82 --
 drivers/staging/benet/be_cm.h             |  134 ---
 drivers/staging/benet/be_common.h         |   53 --
 drivers/staging/benet/be_ethtool.c        |  348 --------
 drivers/staging/benet/be_init.c           | 1382 -----------------------------
 drivers/staging/benet/be_int.c            |  863 ------------------
 drivers/staging/benet/be_netif.c          |  705 ---------------
 drivers/staging/benet/benet.h             |  429 ---------
 drivers/staging/benet/bestatus.h          |  103 ---
 drivers/staging/benet/cev.h               |  243 -----
 drivers/staging/benet/cq.c                |  211 -----
 drivers/staging/benet/descriptors.h       |   71 --
 drivers/staging/benet/doorbells.h         |  179 ----
 drivers/staging/benet/ep.h                |   66 --
 drivers/staging/benet/eq.c                |  299 -------
 drivers/staging/benet/eth.c               | 1273 --------------------------
 drivers/staging/benet/etx_context.h       |   55 --
 drivers/staging/benet/funcobj.c           |  565 ------------
 drivers/staging/benet/fwcmd_common.h      |  222 -----
 drivers/staging/benet/fwcmd_common_bmap.h |  717 ---------------
 drivers/staging/benet/fwcmd_eth_bmap.h    |  280 ------
 drivers/staging/benet/fwcmd_hdr_bmap.h    |   54 --
 drivers/staging/benet/fwcmd_mcc.h         |   94 --
 drivers/staging/benet/fwcmd_opcodes.h     |  244 -----
 drivers/staging/benet/fwcmd_types_bmap.h  |   29 -
 drivers/staging/benet/host_struct.h       |  182 ----
 drivers/staging/benet/hwlib.h             |  830 -----------------
 drivers/staging/benet/mpu.c               | 1364 ----------------------------
 drivers/staging/benet/mpu.h               |   74 --
 drivers/staging/benet/mpu_context.h       |   46 -
 drivers/staging/benet/pcicfg.h            |  825 -----------------
 drivers/staging/benet/post_codes.h        |  111 ---
 drivers/staging/benet/regmap.h            |   68 --
 39 files changed, 0 insertions(+), 12237 deletions(-)
 delete mode 100644 drivers/staging/benet/Kconfig
 delete mode 100644 drivers/staging/benet/MAINTAINERS
 delete mode 100644 drivers/staging/benet/Makefile
 delete mode 100644 drivers/staging/benet/TODO
 delete mode 100644 drivers/staging/benet/asyncmesg.h
 delete mode 100644 drivers/staging/benet/be_cm.h
 delete mode 100644 drivers/staging/benet/be_common.h
 delete mode 100644 drivers/staging/benet/be_ethtool.c
 delete mode 100644 drivers/staging/benet/be_init.c
 delete mode 100644 drivers/staging/benet/be_int.c
 delete mode 100644 drivers/staging/benet/be_netif.c
 delete mode 100644 drivers/staging/benet/benet.h
 delete mode 100644 drivers/staging/benet/bestatus.h
 delete mode 100644 drivers/staging/benet/cev.h
 delete mode 100644 drivers/staging/benet/cq.c
 delete mode 100644 drivers/staging/benet/descriptors.h
 delete mode 100644 drivers/staging/benet/doorbells.h
 delete mode 100644 drivers/staging/benet/ep.h
 delete mode 100644 drivers/staging/benet/eq.c
 delete mode 100644 drivers/staging/benet/eth.c
 delete mode 100644 drivers/staging/benet/etx_context.h
 delete mode 100644 drivers/staging/benet/funcobj.c
 delete mode 100644 drivers/staging/benet/fwcmd_common.h
 delete mode 100644 drivers/staging/benet/fwcmd_common_bmap.h
 delete mode 100644 drivers/staging/benet/fwcmd_eth_bmap.h
 delete mode 100644 drivers/staging/benet/fwcmd_hdr_bmap.h
 delete mode 100644 drivers/staging/benet/fwcmd_mcc.h
 delete mode 100644 drivers/staging/benet/fwcmd_opcodes.h
 delete mode 100644 drivers/staging/benet/fwcmd_types_bmap.h
 delete mode 100644 drivers/staging/benet/host_struct.h
 delete mode 100644 drivers/staging/benet/hwlib.h
 delete mode 100644 drivers/staging/benet/mpu.c
 delete mode 100644 drivers/staging/benet/mpu.h
 delete mode 100644 drivers/staging/benet/mpu_context.h
 delete mode 100644 drivers/staging/benet/pcicfg.h
 delete mode 100644 drivers/staging/benet/post_codes.h
 delete mode 100644 drivers/staging/benet/regmap.h

---------------

Greg Kroah-Hartman (1):
Staging: benet: remove driver now that it is merged in drivers/net/