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/pxa2xx_spi.c | |
| parent | d1964dab60ce7c104dd21590e987a8787db18051 (diff) | |
| parent | 3760d31f11bfbd0ead9eaeb8573e0602437a9d7c (diff) | |
Merge branch 'omap2-upstream' into devel
Diffstat (limited to 'drivers/spi/pxa2xx_spi.c')
| -rw-r--r-- | drivers/spi/pxa2xx_spi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c index 59deed79e0ab..147e26a78d64 100644 --- a/drivers/spi/pxa2xx_spi.c +++ b/drivers/spi/pxa2xx_spi.c | |||
| @@ -44,6 +44,7 @@ | |||
| 44 | MODULE_AUTHOR("Stephen Street"); | 44 | MODULE_AUTHOR("Stephen Street"); |
| 45 | MODULE_DESCRIPTION("PXA2xx SSP SPI Controller"); | 45 | MODULE_DESCRIPTION("PXA2xx SSP SPI Controller"); |
| 46 | MODULE_LICENSE("GPL"); | 46 | MODULE_LICENSE("GPL"); |
| 47 | MODULE_ALIAS("platform:pxa2xx-spi"); | ||
| 47 | 48 | ||
| 48 | #define MAX_BUSES 3 | 49 | #define MAX_BUSES 3 |
| 49 | 50 | ||
| @@ -1581,7 +1582,6 @@ static int pxa2xx_spi_resume(struct platform_device *pdev) | |||
| 1581 | static struct platform_driver driver = { | 1582 | static struct platform_driver driver = { |
| 1582 | .driver = { | 1583 | .driver = { |
| 1583 | .name = "pxa2xx-spi", | 1584 | .name = "pxa2xx-spi", |
| 1584 | .bus = &platform_bus_type, | ||
| 1585 | .owner = THIS_MODULE, | 1585 | .owner = THIS_MODULE, |
| 1586 | }, | 1586 | }, |
| 1587 | .remove = pxa2xx_spi_remove, | 1587 | .remove = pxa2xx_spi_remove, |