diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-04-19 12:17:29 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-19 12:17:29 -0400 |
| commit | adf6d34e460387ee3e8f1e1875d52bff51212c7d (patch) | |
| tree | 88ef100143e6184103a608f82dfd232bf6376eaf /drivers/usb/host/isp116x-hcd.c | |
| parent | d1964dab60ce7c104dd21590e987a8787db18051 (diff) | |
| parent | 3760d31f11bfbd0ead9eaeb8573e0602437a9d7c (diff) | |
Merge branch 'omap2-upstream' into devel
Diffstat (limited to 'drivers/usb/host/isp116x-hcd.c')
| -rw-r--r-- | drivers/usb/host/isp116x-hcd.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c index d7071c855758..203a3359a648 100644 --- a/drivers/usb/host/isp116x-hcd.c +++ b/drivers/usb/host/isp116x-hcd.c | |||
| @@ -1684,14 +1684,18 @@ static int isp116x_resume(struct platform_device *dev) | |||
| 1684 | 1684 | ||
| 1685 | #endif | 1685 | #endif |
| 1686 | 1686 | ||
| 1687 | /* work with hotplug and coldplug */ | ||
| 1688 | MODULE_ALIAS("platform:isp116x-hcd"); | ||
| 1689 | |||
| 1687 | static struct platform_driver isp116x_driver = { | 1690 | static struct platform_driver isp116x_driver = { |
| 1688 | .probe = isp116x_probe, | 1691 | .probe = isp116x_probe, |
| 1689 | .remove = isp116x_remove, | 1692 | .remove = isp116x_remove, |
| 1690 | .suspend = isp116x_suspend, | 1693 | .suspend = isp116x_suspend, |
| 1691 | .resume = isp116x_resume, | 1694 | .resume = isp116x_resume, |
| 1692 | .driver = { | 1695 | .driver = { |
| 1693 | .name = (char *)hcd_name, | 1696 | .name = (char *)hcd_name, |
| 1694 | }, | 1697 | .owner = THIS_MODULE, |
| 1698 | }, | ||
| 1695 | }; | 1699 | }; |
| 1696 | 1700 | ||
| 1697 | /*-----------------------------------------------------------------*/ | 1701 | /*-----------------------------------------------------------------*/ |