diff --git a/[refs] b/[refs] index 8e4f80e026cc..f500eb97572d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4a5d107a9a79ef3404209a43866554cba451dda4 +refs/heads/master: e96763d6e52c22a8821466e4d01c0c995b8087be diff --git a/trunk/arch/i386/mach-generic/bigsmp.c b/trunk/arch/i386/mach-generic/bigsmp.c index 33d9f93557ba..8a210fa915b5 100644 --- a/trunk/arch/i386/mach-generic/bigsmp.c +++ b/trunk/arch/i386/mach-generic/bigsmp.c @@ -45,7 +45,7 @@ static struct dmi_system_id __initdata bigsmp_dmi_table[] = { }; -static __init int probe_bigsmp(void) +static int probe_bigsmp(void) { if (def_to_bigsmp) dmi_bigsmp = 1; diff --git a/trunk/arch/i386/mach-generic/default.c b/trunk/arch/i386/mach-generic/default.c index 96c19821e47d..8685208d8512 100644 --- a/trunk/arch/i386/mach-generic/default.c +++ b/trunk/arch/i386/mach-generic/default.c @@ -18,7 +18,7 @@ #include /* should be called last. */ -static __init int probe_default(void) +static int probe_default(void) { return 1; } diff --git a/trunk/arch/i386/mach-generic/es7000.c b/trunk/arch/i386/mach-generic/es7000.c index aa144d82334d..b8963a5a3b25 100644 --- a/trunk/arch/i386/mach-generic/es7000.c +++ b/trunk/arch/i386/mach-generic/es7000.c @@ -19,7 +19,7 @@ #include #include -static __init int probe_es7000(void) +static int probe_es7000(void) { /* probed later in mptable/ACPI hooks */ return 0; diff --git a/trunk/arch/i386/mach-generic/summit.c b/trunk/arch/i386/mach-generic/summit.c index f7e5d66648dc..74883ccb8f73 100644 --- a/trunk/arch/i386/mach-generic/summit.c +++ b/trunk/arch/i386/mach-generic/summit.c @@ -18,7 +18,7 @@ #include #include -static __init int probe_summit(void) +static int probe_summit(void) { /* probed later in mptable/ACPI hooks */ return 0;