projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into xen-64bit
[cascardo/linux.git]
/
net
/
xfrm
/
Makefile
diff --git
a/net/xfrm/Makefile
b/net/xfrm/Makefile
index
de3c1a6
..
332cfb0
100644
(file)
--- a/
net/xfrm/Makefile
+++ b/
net/xfrm/Makefile
@@
-3,6
+3,7
@@
#
obj-$(CONFIG_XFRM) := xfrm_policy.o xfrm_state.o xfrm_hash.o \
- xfrm_input.o xfrm_algo.o
+ xfrm_input.o xfrm_output.o xfrm_algo.o
+obj-$(CONFIG_XFRM_STATISTICS) += xfrm_proc.o
obj-$(CONFIG_XFRM_USER) += xfrm_user.o