diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-18 09:34:17 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-18 09:34:17 -0700 |
commit | a1e4ee22863d41a6fbb24310d7951836cb6dafe7 (patch) | |
tree | 2425e3d680964a493a2598cd30805053a7be5916 /drivers/staging/benet/Makefile | |
parent | 85bff8857c62ab2bc3ed204de3fcde74781bbdb2 (diff) | |
parent | d0573facf21d1e5cfbc1ddac272b7592722e6c01 (diff) |
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/
Diffstat (limited to 'drivers/staging/benet/Makefile')
-rw-r--r-- | drivers/staging/benet/Makefile | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/staging/benet/Makefile b/drivers/staging/benet/Makefile deleted file mode 100644 index 460b923b99b..00000000000 --- a/drivers/staging/benet/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# -# 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 |