summaryrefslogtreecommitdiffstats
path: root/drivers/net/Makefile
diff options
context:
space:
mode:
author <jgarzik@pretzel.yyz.us>2005-06-04 17:12:32 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-06-04 17:12:32 -0400
commitbdb7a3427be1e31327df0543cc397bf3c994b039 (patch)
treea5cc2585912388a454e23177181c6dd365983681 /drivers/net/Makefile
parent140fedb5f2efd1f23b26afb2d812004556ba9515 (diff)
parent5aa83a4c0a1568257ff7e249d39af64f75978b97 (diff)
downloadblackbird-op-linux-bdb7a3427be1e31327df0543cc397bf3c994b039.tar.gz
blackbird-op-linux-bdb7a3427be1e31327df0543cc397bf3c994b039.zip
Automatic merge of /spare/repo/netdev-2.6 branch remove-drivers
Diffstat (limited to 'drivers/net/Makefile')
-rw-r--r--drivers/net/Makefile2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 0d97be0c77d4..a8a656718054 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -74,7 +74,6 @@ obj-$(CONFIG_MAC8390) += mac8390.o 8390.o
obj-$(CONFIG_APNE) += apne.o 8390.o
obj-$(CONFIG_PCMCIA_PCNET) += 8390.o
obj-$(CONFIG_SHAPER) += shaper.o
-obj-$(CONFIG_SK_G16) += sk_g16.o
obj-$(CONFIG_HP100) += hp100.o
obj-$(CONFIG_SMC9194) += smc9194.o
obj-$(CONFIG_FEC) += fec.o
@@ -122,7 +121,6 @@ obj-$(CONFIG_DEFXX) += defxx.o
obj-$(CONFIG_SGISEEQ) += sgiseeq.o
obj-$(CONFIG_SGI_O2MACE_ETH) += meth.o
obj-$(CONFIG_AT1700) += at1700.o
-obj-$(CONFIG_FMV18X) += fmv18x.o
obj-$(CONFIG_EL1) += 3c501.o
obj-$(CONFIG_EL16) += 3c507.o
obj-$(CONFIG_ELMC) += 3c523.o
OpenPOWER on IntegriCloud