From 2fa8899cef8b492eec69c45f5fecc5050a3027a8 Mon Sep 17 00:00:00 2001
From: David Brownell <david-b@pacbell.net>
Date: Tue, 30 May 2006 20:49:29 -0700
Subject: [PATCH] --- yaml --- r: 28366 b: refs/heads/master c:
 efcaa20525fde82bbb4fb8cd9e9016f6fabc6509 h: refs/heads/master v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/usb/net/cdc_ether.c | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index afb88b90b747..c586616d7fe8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d5ce1379be9c79d4bcf201c20c5cc87bb2bc973c
+refs/heads/master: efcaa20525fde82bbb4fb8cd9e9016f6fabc6509
diff --git a/trunk/drivers/usb/net/cdc_ether.c b/trunk/drivers/usb/net/cdc_ether.c
index 63f1f3ba8e0b..9c6c5b0b01ad 100644
--- a/trunk/drivers/usb/net/cdc_ether.c
+++ b/trunk/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!!!
  *