diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-05 05:45:22 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-05 05:45:22 -0500 |
| commit | a140feab42d1cfd811930ab76104559c19dfc4b0 (patch) | |
| tree | 41fd871990e888dd5616a6bf1891a1ff307221df /drivers/net/usb/zaurus.c | |
| parent | 1075414b06109a99b0e87601e84c74a95bd45681 (diff) | |
| parent | fec6c6fec3e20637bee5d276fb61dd8b49a3f9cc (diff) | |
Merge commit 'v2.6.29-rc7' into core/locking
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 e24f7b3ace4b..04882c8f9bf1 100644 --- a/drivers/net/usb/zaurus.c +++ b/drivers/net/usb/zaurus.c | |||
| @@ -341,6 +341,11 @@ static const struct usb_device_id products [] = { | |||
| 341 | USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_MDLM, | 341 | USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_MDLM, |
| 342 | USB_CDC_PROTO_NONE), | 342 | USB_CDC_PROTO_NONE), |
| 343 | .driver_info = (unsigned long) &bogus_mdlm_info, | 343 | .driver_info = (unsigned long) &bogus_mdlm_info, |
| 344 | }, { | ||
| 345 | /* Motorola MOTOMAGX phones */ | ||
| 346 | USB_DEVICE_AND_INTERFACE_INFO(0x22b8, 0x6425, USB_CLASS_COMM, | ||
| 347 | USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE), | ||
| 348 | .driver_info = (unsigned long) &bogus_mdlm_info, | ||
| 344 | }, | 349 | }, |
| 345 | 350 | ||
| 346 | /* Olympus has some models with a Zaurus-compatible option. | 351 | /* Olympus has some models with a Zaurus-compatible option. |