diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2005-09-18 03:17:10 -0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2005-09-18 03:17:10 -0400 |
| commit | 21f130a2370ba837cdfc5204ebe52e7c664fec3d (patch) | |
| tree | 7f8a30088d8d39eab9350c59b6638661309ffe89 /net/Kconfig | |
| parent | bc5e8fdfc622b03acf5ac974a1b8b26da6511c99 (diff) | |
| parent | c58ec93245a1fb7354f9e331960380827b9f41db (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/Kconfig')
| -rw-r--r-- | net/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/Kconfig b/net/Kconfig index 2bdd5623fdd5..60f6f321bd76 100644 --- a/net/Kconfig +++ b/net/Kconfig | |||
| @@ -140,6 +140,7 @@ config BRIDGE_NETFILTER | |||
| 140 | 140 | ||
| 141 | If unsure, say N. | 141 | If unsure, say N. |
| 142 | 142 | ||
| 143 | source "net/netfilter/Kconfig" | ||
| 143 | source "net/ipv4/netfilter/Kconfig" | 144 | source "net/ipv4/netfilter/Kconfig" |
| 144 | source "net/ipv6/netfilter/Kconfig" | 145 | source "net/ipv6/netfilter/Kconfig" |
| 145 | source "net/decnet/netfilter/Kconfig" | 146 | source "net/decnet/netfilter/Kconfig" |
| @@ -206,8 +207,6 @@ config NET_PKTGEN | |||
| 206 | To compile this code as a module, choose M here: the | 207 | To compile this code as a module, choose M here: the |
| 207 | module will be called pktgen. | 208 | module will be called pktgen. |
| 208 | 209 | ||
| 209 | source "net/netfilter/Kconfig" | ||
| 210 | |||
| 211 | endmenu | 210 | endmenu |
| 212 | 211 | ||
| 213 | endmenu | 212 | endmenu |