diff --git a/[refs] b/[refs] index d64a849201af..15267e7f4e7c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 94e10bfb8a7372df3ef2759c9ec2a37de2f24aca +refs/heads/master: 8d8c90e3fd1f8895f6d48bdcb34ba69a1fe73616 diff --git a/trunk/drivers/ssb/main.c b/trunk/drivers/ssb/main.c index c12a741b5574..fc1d589dc675 100644 --- a/trunk/drivers/ssb/main.c +++ b/trunk/drivers/ssb/main.c @@ -1147,7 +1147,10 @@ static int __init ssb_modinit(void) return err; } -subsys_initcall(ssb_modinit); +/* ssb must be initialized after PCI but before the ssb drivers. + * That means we must use some initcall between subsys_initcall + * and device_initcall. */ +fs_initcall(ssb_modinit); static void __exit ssb_modexit(void) {