diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 09:43:54 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 09:43:54 -0400 |
| commit | b160292cc216a50fd0cd386b0bda2cd48352c73b (patch) | |
| tree | ef07cf98f91353ee4c9ec1e1ca7a2a5d9d4b538a /drivers/spi/spi_bfin5xx.c | |
| parent | b37bde147890c8fea8369a5a4e230dabdea4ebfb (diff) | |
| parent | bbf25010f1a6b761914430f5fca081ec8c7accd1 (diff) | |
Merge Linux 2.6.23
Diffstat (limited to 'drivers/spi/spi_bfin5xx.c')
| -rw-r--r-- | drivers/spi/spi_bfin5xx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/spi/spi_bfin5xx.c b/drivers/spi/spi_bfin5xx.c index 48587c27050d..f540ed77a102 100644 --- a/drivers/spi/spi_bfin5xx.c +++ b/drivers/spi/spi_bfin5xx.c | |||
| @@ -1303,8 +1303,9 @@ static int bfin5xx_spi_resume(struct platform_device *pdev) | |||
| 1303 | #define bfin5xx_spi_resume NULL | 1303 | #define bfin5xx_spi_resume NULL |
| 1304 | #endif /* CONFIG_PM */ | 1304 | #endif /* CONFIG_PM */ |
| 1305 | 1305 | ||
| 1306 | MODULE_ALIAS("bfin-spi-master"); /* for platform bus hotplug */ | ||
| 1306 | static struct platform_driver bfin5xx_spi_driver = { | 1307 | static struct platform_driver bfin5xx_spi_driver = { |
| 1307 | .driver = { | 1308 | .driver = { |
| 1308 | .name = "bfin-spi-master", | 1309 | .name = "bfin-spi-master", |
| 1309 | .owner = THIS_MODULE, | 1310 | .owner = THIS_MODULE, |
| 1310 | }, | 1311 | }, |