diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-06 00:55:55 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-06 00:55:55 -0800 |
| commit | 230f9bb701d37ae9b48e96456689452978f5c439 (patch) | |
| tree | 9d2690917533bbb4498c8c9df838de2d38360912 /drivers/net/usb/Kconfig | |
| parent | 000ba2e43f33901859fd794bb33c885909d53b3b (diff) | |
| parent | 887e671f324d9898aaedb29a6ece6c853c394067 (diff) | |
| download | blackbird-op-linux-230f9bb701d37ae9b48e96456689452978f5c439.tar.gz blackbird-op-linux-230f9bb701d37ae9b48e96456689452978f5c439.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/usb/cdc_ether.c
All CDC ethernet devices of type USB_CLASS_COMM need to use
'&mbm_info'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb/Kconfig')
| -rw-r--r-- | drivers/net/usb/Kconfig | 2 |
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 |
