diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-24 01:52:47 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-24 01:52:47 -0400 |
| commit | 23930fa1cebfea6f79881c588ccd1b0781e49e3f (patch) | |
| tree | 36d29e3f83661c4f5f45b6f74ac0d5f9886867a8 /net/Kconfig | |
| parent | 36b35a5be0e4b406acd816e2122d153e875105be (diff) | |
| parent | 4f5537de7c1531398e84e18a24f667e49cc94208 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'net/Kconfig')
| -rw-r--r-- | net/Kconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/Kconfig b/net/Kconfig index 4959a4e1e0fe..6528a935622c 100644 --- a/net/Kconfig +++ b/net/Kconfig | |||
| @@ -249,6 +249,11 @@ source "net/ieee80211/Kconfig" | |||
| 249 | config WIRELESS_EXT | 249 | config WIRELESS_EXT |
| 250 | bool | 250 | bool |
| 251 | 251 | ||
| 252 | source "net/netlabel/Kconfig" | ||
| 253 | |||
| 254 | config FIB_RULES | ||
| 255 | bool | ||
| 256 | |||
| 252 | endif # if NET | 257 | endif # if NET |
| 253 | endmenu # Networking | 258 | endmenu # Networking |
| 254 | 259 | ||