summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDavid Brownell <david-b@pacbell.net>2006-05-30 20:49:29 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2006-06-21 15:04:15 -0700
commitefcaa20525fde82bbb4fb8cd9e9016f6fabc6509 (patch)
treebdceb58add9793206e4af8a147fe5fccb9bad74d /drivers
parentd5ce1379be9c79d4bcf201c20c5cc87bb2bc973c (diff)
downloadop-kernel-dev-efcaa20525fde82bbb4fb8cd9e9016f6fabc6509.zip
op-kernel-dev-efcaa20525fde82bbb4fb8cd9e9016f6fabc6509.tar.gz
[PATCH] USB: cdc_ether: recognize olympus r1000 (fix regression)
Earlier work splitting the "usbnet" driver out into a core plus driver modules was missing a blacklist entry for the Olympus R-1000; it must not use the CDC Ethernet driver, only the "zaurus" support works with it. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/net/cdc_ether.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/usb/net/cdc_ether.c b/drivers/usb/net/cdc_ether.c
index 63f1f3b..9c6c5b0 100644
--- a/drivers/usb/net/cdc_ether.c
+++ b/drivers/usb/net/cdc_ether.c
@@ -455,6 +455,18 @@ static const struct usb_device_id products [] = {
.driver_info = 0,
},
+/* Olympus has some models with a Zaurus-compatible option.
+ * R-1000 uses a FreeScale i.MXL cpu (ARMv4T)
+ */
+{
+ .match_flags = USB_DEVICE_ID_MATCH_INT_INFO
+ | USB_DEVICE_ID_MATCH_DEVICE,
+ .idVendor = 0x07B4,
+ .idProduct = 0x0F02, /* R-1000 */
+ ZAURUS_MASTER_INTERFACE,
+ .driver_info = 0,
+},
+
/*
* WHITELIST!!!
*
OpenPOWER on IntegriCloud