diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-29 17:49:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-29 17:49:12 -0400 |
| commit | b0c4e148bd591629749d02a8fbc8d81c26d548cf (patch) | |
| tree | 3e2142635f3dc2ceeae870ead2dceab7b9c6def1 /drivers/usb/gadget/pxa2xx_udc.c | |
| parent | 5615ca7906aefbdc3318604c89db5931d0a25910 (diff) | |
| parent | be15cd72d256e5eb3261a781b8507fac83ab33f6 (diff) | |
Merge branch 'master'
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, |