diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-24 16:22:33 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-24 16:22:33 -0400 |
| commit | baea7b946f00a291b166ccae7fcfed6c01530cc6 (patch) | |
| tree | 4aa275fbdbec9c7b9b4629e8bee2bbecd3c6a6af /drivers/spi/pxa2xx_spi.c | |
| parent | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (diff) | |
| parent | 94e0fb086fc5663c38bbc0fe86d698be8314f82f (diff) | |
Merge branch 'origin' into for-linus
Conflicts:
MAINTAINERS
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 8a1fb608e8f1..c8c2b693ffac 100644 --- a/drivers/spi/pxa2xx_spi.c +++ b/drivers/spi/pxa2xx_spi.c | |||
| @@ -1731,7 +1731,7 @@ static int __init pxa2xx_spi_init(void) | |||
| 1731 | { | 1731 | { |
| 1732 | return platform_driver_probe(&driver, pxa2xx_spi_probe); | 1732 | return platform_driver_probe(&driver, pxa2xx_spi_probe); |
| 1733 | } | 1733 | } |
| 1734 | module_init(pxa2xx_spi_init); | 1734 | subsys_initcall(pxa2xx_spi_init); |
| 1735 | 1735 | ||
| 1736 | static void __exit pxa2xx_spi_exit(void) | 1736 | static void __exit pxa2xx_spi_exit(void) |
| 1737 | { | 1737 | { |