diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 15:30:55 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 15:30:55 +0200 |
commit | 29ea35969b92a4be122a58c4aceea8c5e2c388d9 (patch) | |
tree | 8285c0e98e7bb03868d390b58180e3cab876a8db /drivers/net/netconsole.c | |
parent | 112d17d6f75b93e1dcaec2e2232a411148b3bf71 (diff) | |
parent | b4cbb8a4e602ea77b0525d06eff89c6a6070dab3 (diff) |
Merge branch 'imx/devel' into next/devel
Diffstat (limited to 'drivers/net/netconsole.c')
-rw-r--r-- | drivers/net/netconsole.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index dfc82720065a..ed2a3977c6e7 100644 --- a/drivers/net/netconsole.c +++ b/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); |