git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to Fedora kernel-2.6.7-1.492
[linux-2.6.git]
/
net
/
ipv4
/
Makefile
diff --git
a/net/ipv4/Makefile
b/net/ipv4/Makefile
index
5412b1c
..
8289a1d
100644
(file)
--- a/
net/ipv4/Makefile
+++ b/
net/ipv4/Makefile
@@
-23,4
+23,5
@@
obj-$(CONFIG_IP_PNP) += ipconfig.o
obj-$(CONFIG_NETFILTER) += netfilter/
obj-$(CONFIG_IP_VS) += ipvs/
-obj-$(CONFIG_XFRM) += xfrm4_policy.o xfrm4_state.o xfrm4_input.o xfrm4_tunnel.o
+obj-$(CONFIG_XFRM) += xfrm4_policy.o xfrm4_state.o xfrm4_input.o \
+ xfrm4_tunnel.o xfrm4_output.o