diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-07-08 15:58:56 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-07-08 15:58:56 -0700 |
| commit | a448bfbd8e15bb2ed380a75f20adeb6e8d752abb (patch) | |
| tree | 1ab81f3867a5f7e0e9a6cc06fac678d670c2d464 /drivers/net/usb/zaurus.c | |
| parent | 2aced4d6099ce987233ab2ffad42b90800dadf09 (diff) | |
| parent | 0226f8a76da6bc97c9bb4af3fd2f6eeb03c5b0b0 (diff) | |
Merge branch 'upstream/android-3.0' into linaro-android-3.0
Diffstat (limited to 'drivers/net/usb/zaurus.c')
| -rw-r--r-- | drivers/net/usb/zaurus.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/net/usb/zaurus.c b/drivers/net/usb/zaurus.c index 241756e0e86..1a2234c2051 100644 --- a/drivers/net/usb/zaurus.c +++ b/drivers/net/usb/zaurus.c @@ -331,17 +331,7 @@ static const struct usb_device_id products [] = { ZAURUS_MASTER_INTERFACE, .driver_info = ZAURUS_PXA_INFO, }, - - -/* At least some of the newest PXA units have very different lies about - * their standards support: they claim to be cell phones offering - * direct access to their radios! (No, they don't conform to CDC MDLM.) - */ { - USB_INTERFACE_INFO(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), |