Skip to content

Commit

Permalink
staging: et131x: Remove et131x driver from drivers/staging
Browse files Browse the repository at this point in the history
The current version of the et131x driver has been accepted into the
main tree at /drivers/net/ethernet, so it can now be removed from
staging.

The MAINTAINERS entry has not been touched here, as the patch to
add the driver to drivers/net modifies it correctly.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Mark Einon authored and Greg Kroah-Hartman committed Oct 3, 2014
1 parent 77d966f commit e603984
Show file tree
Hide file tree
Showing 7 changed files with 0 additions and 5,687 deletions.
2 changes: 0 additions & 2 deletions drivers/staging/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ menuconfig STAGING

if STAGING

source "drivers/staging/et131x/Kconfig"

source "drivers/staging/slicoss/Kconfig"

source "drivers/staging/wlan-ng/Kconfig"
Expand Down
1 change: 0 additions & 1 deletion drivers/staging/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
obj-$(CONFIG_STAGING) += staging.o

obj-y += media/
obj-$(CONFIG_ET131X) += et131x/
obj-$(CONFIG_SLICOSS) += slicoss/
obj-$(CONFIG_PRISM2_USB) += wlan-ng/
obj-$(CONFIG_COMEDI) += comedi/
Expand Down
10 changes: 0 additions & 10 deletions drivers/staging/et131x/Kconfig

This file was deleted.

5 changes: 0 additions & 5 deletions drivers/staging/et131x/Makefile

This file was deleted.

15 changes: 0 additions & 15 deletions drivers/staging/et131x/README

This file was deleted.

Loading

0 comments on commit e603984

Please sign in to comment.