summaryrefslogtreecommitdiffstats
path: root/drivers/staging/Makefile
diff options
context:
space:
mode:
authorMark Einon <mark.einon@gmail.com>2014-10-03 21:45:53 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-10-03 13:55:14 -0700
commite603984823a9218857c599195aaa514c5343de03 (patch)
tree55ee25a6602011ec915b492700dba65c77a82211 /drivers/staging/Makefile
parent77d966f4b02179ad0b7b12179fedbd12b0c4f735 (diff)
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: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/Makefile')
-rw-r--r--drivers/staging/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 66a6932c05d..c780a0e70e1 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -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/