Commit e6039848 authored by Mark Einon's avatar Mark Einon Committed by Greg Kroah-Hartman
Browse files

staging: et131x: Remove et131x driver from drivers/staging



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: default avatarMark Einon <mark.einon@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 77d966f4
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ menuconfig STAGING

if STAGING

source "drivers/staging/et131x/Kconfig"

source "drivers/staging/slicoss/Kconfig"

source "drivers/staging/wlan-ng/Kconfig"
+0 −1
Original line number Diff line number Diff line
@@ -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/

drivers/staging/et131x/Kconfig

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line
config ET131X
	tristate "Agere ET-1310 Gigabit Ethernet support"
	depends on PCI && NET && NETDEVICES
	select PHYLIB
	default n
	---help---
	  This driver supports Agere ET-1310 ethernet adapters.

	  To compile this driver as a module, choose M here. The module
	  will be called et131x.

drivers/staging/et131x/Makefile

deleted100644 → 0
+0 −5
Original line number Diff line number Diff line
#
# Makefile for the Agere ET-131x ethernet driver
#

obj-$(CONFIG_ET131X) += et131x.o

drivers/staging/et131x/README

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line
This is a driver for the ET1310 network device.

Based on the driver found at https://sourceforge.net/projects/et131x/

Cleaned up immensely by Olaf Hartman and Christoph Hellwig <hch@infradead.org>

Note, the powermanagement options were removed from the vendor provided
driver as they did not build properly at the time.

TODO:

Please send patches to:
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mark Einon <mark.einon@gmail.com>
Loading