diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-03 09:08:57 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-03 09:08:57 -0400 |
| commit | 76467874b83835129dc454e3a7a8e5d1186101b0 (patch) | |
| tree | 162129f0c36c35be4aa323cf00626db0e804c3fc /drivers/net/Kconfig | |
| parent | 8628de0583504138551a05ad44ca388467f0f552 (diff) | |
| parent | 6246b6128bbe34d0752f119cf7c5111c85fe481d (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index e20b849a22e8..bdaaad8f2123 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -2313,13 +2313,11 @@ config S2IO_NAPI | |||
| 2313 | 2313 | ||
| 2314 | endmenu | 2314 | endmenu |
| 2315 | 2315 | ||
| 2316 | if !UML | ||
| 2317 | source "drivers/net/tokenring/Kconfig" | 2316 | source "drivers/net/tokenring/Kconfig" |
| 2318 | 2317 | ||
| 2319 | source "drivers/net/wireless/Kconfig" | 2318 | source "drivers/net/wireless/Kconfig" |
| 2320 | 2319 | ||
| 2321 | source "drivers/net/pcmcia/Kconfig" | 2320 | source "drivers/net/pcmcia/Kconfig" |
| 2322 | endif | ||
| 2323 | 2321 | ||
| 2324 | source "drivers/net/wan/Kconfig" | 2322 | source "drivers/net/wan/Kconfig" |
| 2325 | 2323 | ||