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 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[pandora-kernel.git]
/
include
/
linux
/
netfilter_ipv4
/
Kbuild
diff --git
a/include/linux/netfilter_ipv4/Kbuild
b/include/linux/netfilter_ipv4/Kbuild
index
591c1a8
..
1803378
100644
(file)
--- a/
include/linux/netfilter_ipv4/Kbuild
+++ b/
include/linux/netfilter_ipv4/Kbuild
@@
-1,6
+1,4
@@
header-y += ip_conntrack_helper.h
-header-y += ip_conntrack_helper_h323_asn1.h
-header-y += ip_conntrack_helper_h323_types.h
header-y += ip_conntrack_protocol.h
header-y += ip_conntrack_sctp.h
header-y += ip_conntrack_tcp.h