diff --git a/[refs] b/[refs] index 12de037d5ee3..37ed08afb80d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 474c256841074b913e76e392082373e12103a75d +refs/heads/master: e8924acb2ef46b96c93f97025815ef3843cb67a2 diff --git a/trunk/arch/i386/kernel/acpi/boot.c b/trunk/arch/i386/kernel/acpi/boot.c index c809a3f4c0bf..0fba420d668a 100644 --- a/trunk/arch/i386/kernel/acpi/boot.c +++ b/trunk/arch/i386/kernel/acpi/boot.c @@ -36,7 +36,7 @@ #include #include -int __initdata acpi_force = 0; +static int __initdata acpi_force = 0; #ifdef CONFIG_ACPI int acpi_disabled = 0;