summaryrefslogtreecommitdiffstats
path: root/drivers/net/usb/Kconfig
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2009-11-17 10:01:34 +0100
committerEric W. Biederman <ebiederm@xmission.com>2009-11-17 10:01:34 +0100
commitbb9074ff58fe745e4f244f76209241909c82ec9c (patch)
treecf6be00ab88b1e315f6b74a896a370440f677599 /drivers/net/usb/Kconfig
parentsysctl: Remove the last of the generic binary sysctl support (diff)
parentLinux 2.6.32-rc7 (diff)
downloadlinux-bb9074ff58fe745e4f244f76209241909c82ec9c.tar.xz
linux-bb9074ff58fe745e4f244f76209241909c82ec9c.zip
Merge commit 'v2.6.32-rc7'
Resolve the conflict between v2.6.32-rc7 where dn_def_dev_handler gets a small bug fix and the sysctl tree where I am removing all sysctl strategy routines.
Diffstat (limited to 'drivers/net/usb/Kconfig')
-rw-r--r--drivers/net/usb/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig
index c47237c2d638..32d93564a74d 100644
--- a/drivers/net/usb/Kconfig
+++ b/drivers/net/usb/Kconfig
@@ -174,7 +174,7 @@ config USB_NET_CDCETHER
* Ericsson Mobile Broadband Module (all variants)
* Motorola (DM100 and SB4100)
* Broadcom Cable Modem (reference design)
- * Toshiba (PCX1100U and F3507g)
+ * Toshiba (PCX1100U and F3507g/F3607gw)
* ...
This driver creates an interface named "ethX", where X depends on