diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 00:08:14 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 00:08:14 -0400 |
| commit | 1f419cadff55f548e7356ffebdb9e1b5a8c22275 (patch) | |
| tree | 07c04d053322e9913a6b445b2fe00510299e97cf /drivers/usb/gadget/pxa2xx_udc.c | |
| parent | 974f7bc5781d3fc16e32d8908c6e48592e767dd2 (diff) | |
| parent | 4303fc6f055cf1a7ec63c3c3fd777b91b7d576f1 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
Diffstat (limited to 'drivers/usb/gadget/pxa2xx_udc.c')
| -rw-r--r-- | drivers/usb/gadget/pxa2xx_udc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/gadget/pxa2xx_udc.c b/drivers/usb/gadget/pxa2xx_udc.c index 647028590b23..f83a9262f953 100644 --- a/drivers/usb/gadget/pxa2xx_udc.c +++ b/drivers/usb/gadget/pxa2xx_udc.c | |||
| @@ -2631,6 +2631,7 @@ static int pxa2xx_udc_resume(struct device *dev) | |||
| 2631 | 2631 | ||
| 2632 | static struct device_driver udc_driver = { | 2632 | static struct device_driver udc_driver = { |
| 2633 | .name = "pxa2xx-udc", | 2633 | .name = "pxa2xx-udc", |
| 2634 | .owner = THIS_MODULE, | ||
| 2634 | .bus = &platform_bus_type, | 2635 | .bus = &platform_bus_type, |
| 2635 | .probe = pxa2xx_udc_probe, | 2636 | .probe = pxa2xx_udc_probe, |
| 2636 | .shutdown = pxa2xx_udc_shutdown, | 2637 | .shutdown = pxa2xx_udc_shutdown, |