diff options
| author | Patrick McHardy <kaber@trash.net> | 2009-06-11 10:00:49 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2009-06-11 10:00:49 -0400 |
| commit | 36432dae73cf2c90a59b39c8df9fd8219272b005 (patch) | |
| tree | 660b9104305a809ec4fdeb295ca13d6e90790ecc /net/Kconfig | |
| parent | 440f0d588555892601cfe511728a0fc0c8204063 (diff) | |
| parent | bb400801c2f40bbd9a688818323ad09abfc4e581 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
Diffstat (limited to 'net/Kconfig')
| -rw-r--r-- | net/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/Kconfig b/net/Kconfig index c19f549c8e74..7051b9710675 100644 --- a/net/Kconfig +++ b/net/Kconfig | |||
| @@ -179,6 +179,7 @@ source "net/lapb/Kconfig" | |||
| 179 | source "net/econet/Kconfig" | 179 | source "net/econet/Kconfig" |
| 180 | source "net/wanrouter/Kconfig" | 180 | source "net/wanrouter/Kconfig" |
| 181 | source "net/phonet/Kconfig" | 181 | source "net/phonet/Kconfig" |
| 182 | source "net/ieee802154/Kconfig" | ||
| 182 | source "net/sched/Kconfig" | 183 | source "net/sched/Kconfig" |
| 183 | source "net/dcb/Kconfig" | 184 | source "net/dcb/Kconfig" |
| 184 | 185 | ||