diff options
| author | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-18 17:06:00 -0400 |
|---|---|---|
| committer | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-18 17:06:00 -0400 |
| commit | a215aa7b9ab3759c047201199fba64d3042d7f13 (patch) | |
| tree | bca37493d9b2233450e6d3ffced1261d0e4f71fe /drivers/usb/gadget/g_ffs.c | |
| parent | d31199a77ef606f1d06894385f1852181ba6136b (diff) | |
Update 2.6.36 to 2.6.36.4wip-dissipation2-jerickso
Diffstat (limited to 'drivers/usb/gadget/g_ffs.c')
| -rw-r--r-- | drivers/usb/gadget/g_ffs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/gadget/g_ffs.c b/drivers/usb/gadget/g_ffs.c index a9474f8d5325..3c2f0a43c9c6 100644 --- a/drivers/usb/gadget/g_ffs.c +++ b/drivers/usb/gadget/g_ffs.c | |||
| @@ -53,8 +53,8 @@ MODULE_AUTHOR("Michal Nazarewicz"); | |||
| 53 | MODULE_LICENSE("GPL"); | 53 | MODULE_LICENSE("GPL"); |
| 54 | 54 | ||
| 55 | 55 | ||
| 56 | static unsigned short gfs_vendor_id = 0x0525; /* XXX NetChip */ | 56 | static unsigned short gfs_vendor_id = 0x1d6b; /* Linux Foundation */ |
| 57 | static unsigned short gfs_product_id = 0xa4ac; /* XXX */ | 57 | static unsigned short gfs_product_id = 0x0105; /* FunctionFS Gadget */ |
| 58 | 58 | ||
| 59 | static struct usb_device_descriptor gfs_dev_desc = { | 59 | static struct usb_device_descriptor gfs_dev_desc = { |
| 60 | .bLength = sizeof gfs_dev_desc, | 60 | .bLength = sizeof gfs_dev_desc, |