git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...
[pandora-kernel.git]
/
net
/
Makefile
diff --git
a/net/Makefile
b/net/Makefile
index
e050d9d
..
4f4ee08
100644
(file)
--- a/
net/Makefile
+++ b/
net/Makefile
@@
-19,7
+19,7
@@
obj-$(CONFIG_NETFILTER) += netfilter/
obj-$(CONFIG_INET) += ipv4/
obj-$(CONFIG_XFRM) += xfrm/
obj-$(CONFIG_UNIX) += unix/
-obj-$(CONFIG_
INET)
+= ipv6/
+obj-$(CONFIG_
NET)
+= ipv6/
obj-$(CONFIG_PACKET) += packet/
obj-$(CONFIG_NET_KEY) += key/
obj-$(CONFIG_BRIDGE) += bridge/