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 git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next
[linux-2.6-block.git]
/
drivers
/
net
/
ethernet
/
Makefile
diff --git
a/drivers/net/ethernet/Makefile
b/drivers/net/ethernet/Makefile
index 4bc3c95562bf1253cd71db2fca433f5b61ef1270..77f9838a76c941d6f1506345ef73a95cd2b61253 100644
(file)
--- a/
drivers/net/ethernet/Makefile
+++ b/
drivers/net/ethernet/Makefile
@@
-96,3
+96,4
@@
obj-$(CONFIG_NET_VENDOR_WIZNET) += wiznet/
obj-$(CONFIG_NET_VENDOR_XILINX) += xilinx/
obj-$(CONFIG_NET_VENDOR_XIRCOM) += xircom/
obj-$(CONFIG_NET_VENDOR_SYNOPSYS) += synopsys/
+obj-$(CONFIG_NET_VENDOR_PENSANDO) += pensando/