diff --git a/[refs] b/[refs] index 3876530ca065..1ad4c71c802e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 710778ff878a06654175863db133293007d45aee +refs/heads/master: 97c7de055713afddf4218f19c896b5185555da15 diff --git a/trunk/drivers/net/netconsole.c b/trunk/drivers/net/netconsole.c index dfc82720065a..ed2a3977c6e7 100644 --- a/trunk/drivers/net/netconsole.c +++ b/trunk/drivers/net/netconsole.c @@ -799,5 +799,11 @@ static void __exit cleanup_netconsole(void) } } -module_init(init_netconsole); +/* + * Use late_initcall to ensure netconsole is + * initialized after network device driver if built-in. + * + * late_initcall() and module_init() are identical if built as module. + */ +late_initcall(init_netconsole); module_exit(cleanup_netconsole);