summaryrefslogtreecommitdiffstats
path: root/drivers/net/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-09 18:53:12 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-09 18:53:12 -0700
commitb5f0adbcc4f16e378882d8f68fe3111df04911be (patch)
treeb4326ed528a0962abe9e0bf783f687b3b23e4896 /drivers/net/Kconfig
parent0a09d9a49cc4a7f65b76f848821d4a8bb7cc1230 (diff)
parent5b2fc499917e5897a13add780e181b4cef197072 (diff)
downloadblackbird-op-linux-b5f0adbcc4f16e378882d8f68fe3111df04911be.tar.gz
blackbird-op-linux-b5f0adbcc4f16e378882d8f68fe3111df04911be.zip
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/Kconfig2
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"
source "drivers/net/wireless/Kconfig"
+source "drivers/net/usb/Kconfig"
+
source "drivers/net/pcmcia/Kconfig"
source "drivers/net/wan/Kconfig"
OpenPOWER on IntegriCloud