projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
[linux-2.6-block.git]
/
drivers
/
net
/
Makefile
diff --git
a/drivers/net/Makefile
b/drivers/net/Makefile
index 1c378dd5933e665214863ee0d97b6657e21c2f84..d366fb2b40e99e2065408160243c12da9cc95c33 100644
(file)
--- a/
drivers/net/Makefile
+++ b/
drivers/net/Makefile
@@
-75,6
+75,7
@@
obj-$(CONFIG_STNIC) += stnic.o 8390.o
obj-$(CONFIG_FEALNX) += fealnx.o
obj-$(CONFIG_TIGON3) += tg3.o
obj-$(CONFIG_BNX2) += bnx2.o
+obj-$(CONFIG_CNIC) += cnic.o
obj-$(CONFIG_BNX2X) += bnx2x.o
bnx2x-objs := bnx2x_main.o bnx2x_link.o
spidernet-y += spider_net.o spider_net_ethtool.o