diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-03 05:43:41 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-03 05:43:41 -0400 |
| commit | b2f8f7525c8aa1fdd8ad8c72c832dfb571d5f768 (patch) | |
| tree | 71ae1801d264bca62efa0d22376b49de7f206e9a /drivers/net/Makefile | |
| parent | d455e5b165a367a628110ec2d18807ea10052cd1 (diff) | |
| parent | 12186be7d2e1106cede1cc728526e3d7998cbe94 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/forcedeth.c
Diffstat (limited to 'drivers/net/Makefile')
| -rw-r--r-- | drivers/net/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index f07a1e95641..774c2b45bdb 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile | |||
| @@ -105,7 +105,7 @@ obj-$(CONFIG_HAMACHI) += hamachi.o | |||
| 105 | obj-$(CONFIG_NET) += Space.o loopback.o | 105 | obj-$(CONFIG_NET) += Space.o loopback.o |
| 106 | obj-$(CONFIG_SEEQ8005) += seeq8005.o | 106 | obj-$(CONFIG_SEEQ8005) += seeq8005.o |
| 107 | obj-$(CONFIG_NET_SB1000) += sb1000.o | 107 | obj-$(CONFIG_NET_SB1000) += sb1000.o |
| 108 | obj-$(CONFIG_MAC8390) += mac8390.o 8390.o | 108 | obj-$(CONFIG_MAC8390) += mac8390.o |
| 109 | obj-$(CONFIG_APNE) += apne.o 8390.o | 109 | obj-$(CONFIG_APNE) += apne.o 8390.o |
| 110 | obj-$(CONFIG_PCMCIA_PCNET) += 8390.o | 110 | obj-$(CONFIG_PCMCIA_PCNET) += 8390.o |
| 111 | obj-$(CONFIG_HP100) += hp100.o | 111 | obj-$(CONFIG_HP100) += hp100.o |