diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-06-04 17:02:29 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-04 17:02:29 -0400 |
| commit | 79121839aad7153907b92462759675266f1f2ac4 (patch) | |
| tree | 04193828c34aa1b46149840b2b24cdb703aaab5c /drivers/net/Makefile | |
| parent | b00b2f70ddde86b0a4674b8518c78d3ad5dc68b7 (diff) | |
| parent | a1365275e745bb0a173c918a52bcdfa6ce122f7e (diff) | |
Automatic merge of /spare/repo/netdev-2.6 branch dm9000
Diffstat (limited to 'drivers/net/Makefile')
| -rw-r--r-- | drivers/net/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 30c7567001fe..0d97be0c77d4 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile | |||
| @@ -180,6 +180,7 @@ obj-$(CONFIG_AMD8111_ETH) += amd8111e.o | |||
| 180 | obj-$(CONFIG_IBMVETH) += ibmveth.o | 180 | obj-$(CONFIG_IBMVETH) += ibmveth.o |
| 181 | obj-$(CONFIG_S2IO) += s2io.o | 181 | obj-$(CONFIG_S2IO) += s2io.o |
| 182 | obj-$(CONFIG_SMC91X) += smc91x.o | 182 | obj-$(CONFIG_SMC91X) += smc91x.o |
| 183 | obj-$(CONFIG_DM9000) += dm9000.o | ||
| 183 | obj-$(CONFIG_FEC_8XX) += fec_8xx/ | 184 | obj-$(CONFIG_FEC_8XX) += fec_8xx/ |
| 184 | 185 | ||
| 185 | obj-$(CONFIG_ARM) += arm/ | 186 | obj-$(CONFIG_ARM) += arm/ |