diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-06 20:52:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-06 20:52:56 -0400 |
| commit | 9e865f58da5ff0a9c19669a49ac984117711757a (patch) | |
| tree | 21f64e79ac21d794df5a407f10a9326e26d38f17 /include/linux | |
| parent | 111e2a513bac77d317011350f34f9cc30deb9806 (diff) | |
| parent | be1b685fe6c9928848b26b568eaa86ba8ce0046c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[NETFILTER]: Add xt_statistic.h to the header list for usermode programs
[BNX2]: Fix suspend/resume problem.
[TG3]: Fix suspend/resume problem.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netfilter/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/netfilter/Kbuild b/include/linux/netfilter/Kbuild index 43397a414cd6..ab57cb7d7c61 100644 --- a/include/linux/netfilter/Kbuild +++ b/include/linux/netfilter/Kbuild | |||
| @@ -28,6 +28,7 @@ header-y += xt_policy.h | |||
| 28 | header-y += xt_realm.h | 28 | header-y += xt_realm.h |
| 29 | header-y += xt_sctp.h | 29 | header-y += xt_sctp.h |
| 30 | header-y += xt_state.h | 30 | header-y += xt_state.h |
| 31 | header-y += xt_statistic.h | ||
| 31 | header-y += xt_string.h | 32 | header-y += xt_string.h |
| 32 | header-y += xt_tcpmss.h | 33 | header-y += xt_tcpmss.h |
| 33 | header-y += xt_tcpudp.h | 34 | header-y += xt_tcpudp.h |