diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-23 10:36:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-23 10:36:04 -0700 |
| commit | dc4c26bfedcdd2b52231864c130bee2388e0eae4 (patch) | |
| tree | ae2a2770143069fcde525839a8dd6076b1874569 | |
| parent | 847bb224fb1cc8747e58959721b7bccd9b118047 (diff) | |
| parent | f95d76ab82c381ce2221fbe75f331ff1478732db (diff) | |
| download | kernel_samsung_smdk4412-dc4c26bfedcdd2b52231864c130bee2388e0eae4.zip kernel_samsung_smdk4412-dc4c26bfedcdd2b52231864c130bee2388e0eae4.tar.gz kernel_samsung_smdk4412-dc4c26bfedcdd2b52231864c130bee2388e0eae4.tar.bz2 | |
Merge branch 'misc' of git://git.kernel.dk/linux-2.6-block
* 'misc' of git://git.kernel.dk/linux-2.6-block:
ipheth: add support for iPhone 4
| -rw-r--r-- | drivers/net/usb/ipheth.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/usb/ipheth.c b/drivers/net/usb/ipheth.c index 08e7b6a..8ed30fa 100644 --- a/drivers/net/usb/ipheth.c +++ b/drivers/net/usb/ipheth.c @@ -58,6 +58,7 @@ #define USB_PRODUCT_IPHONE 0x1290 #define USB_PRODUCT_IPHONE_3G 0x1292 #define USB_PRODUCT_IPHONE_3GS 0x1294 +#define USB_PRODUCT_IPHONE_4 0x1297 #define IPHETH_USBINTF_CLASS 255 #define IPHETH_USBINTF_SUBCLASS 253 @@ -92,6 +93,10 @@ static struct usb_device_id ipheth_table[] = { USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_3GS, IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS, IPHETH_USBINTF_PROTO) }, + { USB_DEVICE_AND_INTERFACE_INFO( + USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_4, + IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS, + IPHETH_USBINTF_PROTO) }, { } }; MODULE_DEVICE_TABLE(usb, ipheth_table); |