projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'drm-intel-fixes-2013-07-11' of git://people.freedesktop.org/~danvet/drm...
[cascardo/linux.git]
/
drivers
/
net
/
Makefile
diff --git
a/drivers/net/Makefile
b/drivers/net/Makefile
index
ef3d090
..
3fef8a8
100644
(file)
--- a/
drivers/net/Makefile
+++ b/
drivers/net/Makefile
@@
-22,6
+22,7
@@
obj-$(CONFIG_TUN) += tun.o
obj-$(CONFIG_VETH) += veth.o
obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
obj-$(CONFIG_VXLAN) += vxlan.o
+obj-$(CONFIG_NLMON) += nlmon.o
#
# Networking Drivers