diff --git a/[refs] b/[refs] index 6ded1fb826de..f35be050c8b5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 16f159b1fc4f227a25cc4792e3804353e4777ebe +refs/heads/master: cae0554126e0545f8fc37282db7a906df1ec5c3c diff --git a/trunk/arch/arm/mach-pxa/ssp.c b/trunk/arch/arm/mach-pxa/ssp.c index b6d37fa7b85f..575b662200a7 100644 --- a/trunk/arch/arm/mach-pxa/ssp.c +++ b/trunk/arch/arm/mach-pxa/ssp.c @@ -524,7 +524,7 @@ static void __exit pxa_ssp_exit(void) platform_driver_unregister(&pxa27x_ssp_driver); } -module_init(pxa_ssp_init); +arch_initcall(pxa_ssp_init); module_exit(pxa_ssp_exit); EXPORT_SYMBOL(ssp_write_word);