diff --git a/[refs] b/[refs] index 04434a519ebe..9954855509b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7ec7fb394298c212c30e063c57e0aa895efe9439 +refs/heads/master: ff083c8372f6312bb3a8c7f7b748920aeeb210c9 diff --git a/trunk/init/do_mounts_md.c b/trunk/init/do_mounts_md.c index d6da5cdd3c38..ff95e3192884 100644 --- a/trunk/init/do_mounts_md.c +++ b/trunk/init/do_mounts_md.c @@ -271,7 +271,7 @@ static int __init raid_setup(char *str) __setup("raid=", raid_setup); __setup("md=", md_setup); -static void autodetect_raid(void) +static void __init autodetect_raid(void) { int fd;