diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 21:53:12 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 21:53:12 -0400 |
| commit | b5f0adbcc4f16e378882d8f68fe3111df04911be (patch) | |
| tree | b4326ed528a0962abe9e0bf783f687b3b23e4896 /drivers/net/Kconfig | |
| parent | 0a09d9a49cc4a7f65b76f848821d4a8bb7cc1230 (diff) | |
| parent | 5b2fc499917e5897a13add780e181b4cef197072 (diff) | |
Merge branch 'usb-move' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'usb-move' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
Move USB network drivers to drivers/net/usb.
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index b86ccd2ecd5b..d9842d8544dc 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -2499,6 +2499,8 @@ source "drivers/net/tokenring/Kconfig" | |||
| 2499 | 2499 | ||
| 2500 | source "drivers/net/wireless/Kconfig" | 2500 | source "drivers/net/wireless/Kconfig" |
| 2501 | 2501 | ||
| 2502 | source "drivers/net/usb/Kconfig" | ||
| 2503 | |||
| 2502 | source "drivers/net/pcmcia/Kconfig" | 2504 | source "drivers/net/pcmcia/Kconfig" |
| 2503 | 2505 | ||
| 2504 | source "drivers/net/wan/Kconfig" | 2506 | source "drivers/net/wan/Kconfig" |