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/spi/spi_imx.c | |
| parent | d1964dab60ce7c104dd21590e987a8787db18051 (diff) | |
| parent | 3760d31f11bfbd0ead9eaeb8573e0602437a9d7c (diff) | |
Merge branch 'omap2-upstream' into devel
Diffstat (limited to 'drivers/spi/spi_imx.c')
| -rw-r--r-- | drivers/spi/spi_imx.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c index 1b0647124933..d4ba640366b6 100644 --- a/drivers/spi/spi_imx.c +++ b/drivers/spi/spi_imx.c | |||
| @@ -1722,10 +1722,12 @@ static int spi_imx_resume(struct platform_device *pdev) | |||
| 1722 | #define spi_imx_resume NULL | 1722 | #define spi_imx_resume NULL |
| 1723 | #endif /* CONFIG_PM */ | 1723 | #endif /* CONFIG_PM */ |
| 1724 | 1724 | ||
| 1725 | /* work with hotplug and coldplug */ | ||
| 1726 | MODULE_ALIAS("platform:spi_imx"); | ||
| 1727 | |||
| 1725 | static struct platform_driver driver = { | 1728 | static struct platform_driver driver = { |
| 1726 | .driver = { | 1729 | .driver = { |
| 1727 | .name = "spi_imx", | 1730 | .name = "spi_imx", |
| 1728 | .bus = &platform_bus_type, | ||
| 1729 | .owner = THIS_MODULE, | 1731 | .owner = THIS_MODULE, |
| 1730 | }, | 1732 | }, |
| 1731 | .remove = __exit_p(spi_imx_remove), | 1733 | .remove = __exit_p(spi_imx_remove), |