diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-14 20:36:54 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-14 20:36:54 -0400 |
| commit | 7dafd239ab522d38979ebe44d79aa68ad7b1a383 (patch) | |
| tree | 04754a0c6495e57c1fe5f417fbfc99272d353c0e /drivers/net/Makefile | |
| parent | bc47ab0241c7c86da4f5e5f82fbca7d45387c18d (diff) | |
| parent | 45e3e1935e2857c54783291107d33323b3ef33c8 (diff) | |
Merge commit 'origin/master' into next
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 a1c25cb4669f..db30ebd7b262 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile | |||
| @@ -73,6 +73,7 @@ obj-$(CONFIG_STNIC) += stnic.o 8390.o | |||
| 73 | obj-$(CONFIG_FEALNX) += fealnx.o | 73 | obj-$(CONFIG_FEALNX) += fealnx.o |
| 74 | obj-$(CONFIG_TIGON3) += tg3.o | 74 | obj-$(CONFIG_TIGON3) += tg3.o |
| 75 | obj-$(CONFIG_BNX2) += bnx2.o | 75 | obj-$(CONFIG_BNX2) += bnx2.o |
| 76 | obj-$(CONFIG_CNIC) += cnic.o | ||
| 76 | obj-$(CONFIG_BNX2X) += bnx2x.o | 77 | obj-$(CONFIG_BNX2X) += bnx2x.o |
| 77 | bnx2x-objs := bnx2x_main.o bnx2x_link.o | 78 | bnx2x-objs := bnx2x_main.o bnx2x_link.o |
| 78 | spidernet-y += spider_net.o spider_net_ethtool.o | 79 | spidernet-y += spider_net.o spider_net_ethtool.o |