diff options
author | Clark Williams <williams@redhat.com> | 2012-04-14 09:13:39 -0500 |
---|---|---|
committer | Clark Williams <williams@redhat.com> | 2012-04-14 09:13:39 -0500 |
commit | 4905660cd237e4c4ede46920851caa12739f006f (patch) | |
tree | ef37e7c9f52c9ae9c2b206658556f37d67fe43eb /drivers/net/usb/zaurus.c | |
parent | 1b5e39fc18a1b8ff7ea425ce5f49307cb28a880f (diff) | |
parent | 0147c2ae9d602b5791dae30322ece475271acd10 (diff) |
Merge commit 'v3.2.15' into rt-3.2.15-rt24v3.2.15-rt24
Diffstat (limited to 'drivers/net/usb/zaurus.c')
-rw-r--r-- | drivers/net/usb/zaurus.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/usb/zaurus.c b/drivers/net/usb/zaurus.c index 246b3bb14f23..c1e6a446d13c 100644 --- a/drivers/net/usb/zaurus.c +++ b/drivers/net/usb/zaurus.c @@ -332,6 +332,11 @@ static const struct usb_device_id products [] = { .driver_info = ZAURUS_PXA_INFO, }, { + /* Motorola Rokr E6 */ + USB_DEVICE_AND_INTERFACE_INFO(0x22b8, 0x6027, USB_CLASS_COMM, + USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE), + .driver_info = (unsigned long) &bogus_mdlm_info, +}, { /* Motorola MOTOMAGX phones */ USB_DEVICE_AND_INTERFACE_INFO(0x22b8, 0x6425, USB_CLASS_COMM, USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE), |