diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-06-04 17:12:32 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-04 17:12:32 -0400 |
| commit | bdb7a3427be1e31327df0543cc397bf3c994b039 (patch) | |
| tree | a5cc2585912388a454e23177181c6dd365983681 /drivers/net/Makefile | |
| parent | 140fedb5f2efd1f23b26afb2d812004556ba9515 (diff) | |
| parent | 5aa83a4c0a1568257ff7e249d39af64f75978b97 (diff) | |
Automatic merge of /spare/repo/netdev-2.6 branch remove-drivers
Diffstat (limited to 'drivers/net/Makefile')
| -rw-r--r-- | drivers/net/Makefile | 2 |
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 | |||
| 74 | obj-$(CONFIG_APNE) += apne.o 8390.o | 74 | obj-$(CONFIG_APNE) += apne.o 8390.o |
| 75 | obj-$(CONFIG_PCMCIA_PCNET) += 8390.o | 75 | obj-$(CONFIG_PCMCIA_PCNET) += 8390.o |
| 76 | obj-$(CONFIG_SHAPER) += shaper.o | 76 | obj-$(CONFIG_SHAPER) += shaper.o |
| 77 | obj-$(CONFIG_SK_G16) += sk_g16.o | ||
| 78 | obj-$(CONFIG_HP100) += hp100.o | 77 | obj-$(CONFIG_HP100) += hp100.o |
| 79 | obj-$(CONFIG_SMC9194) += smc9194.o | 78 | obj-$(CONFIG_SMC9194) += smc9194.o |
| 80 | obj-$(CONFIG_FEC) += fec.o | 79 | obj-$(CONFIG_FEC) += fec.o |
| @@ -122,7 +121,6 @@ obj-$(CONFIG_DEFXX) += defxx.o | |||
| 122 | obj-$(CONFIG_SGISEEQ) += sgiseeq.o | 121 | obj-$(CONFIG_SGISEEQ) += sgiseeq.o |
| 123 | obj-$(CONFIG_SGI_O2MACE_ETH) += meth.o | 122 | obj-$(CONFIG_SGI_O2MACE_ETH) += meth.o |
| 124 | obj-$(CONFIG_AT1700) += at1700.o | 123 | obj-$(CONFIG_AT1700) += at1700.o |
| 125 | obj-$(CONFIG_FMV18X) += fmv18x.o | ||
| 126 | obj-$(CONFIG_EL1) += 3c501.o | 124 | obj-$(CONFIG_EL1) += 3c501.o |
| 127 | obj-$(CONFIG_EL16) += 3c507.o | 125 | obj-$(CONFIG_EL16) += 3c507.o |
| 128 | obj-$(CONFIG_ELMC) += 3c523.o | 126 | obj-$(CONFIG_ELMC) += 3c523.o |