diff --git a/[refs] b/[refs]
index ef0abfeb45a0..52017cc01370 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 072971d7d3e70ddac5c5be3436d929470cc2b3fb
+refs/heads/master: 3312111d1bd1a409892031f7979c57a52b01185c
diff --git a/trunk/drivers/acpi/osl.c b/trunk/drivers/acpi/osl.c
index 3f244eb99e04..5cfb7b5cc0b8 100644
--- a/trunk/drivers/acpi/osl.c
+++ b/trunk/drivers/acpi/osl.c
@@ -77,7 +77,7 @@ static struct workqueue_struct *kacpi_notify_wq;
 #define	OSI_STRING_LENGTH_MAX 64	/* arbitrary */
 static char osi_additional_string[OSI_STRING_LENGTH_MAX];
 
-int osi_linux;		/* disable _OSI(Linux) by default */
+static int osi_linux;		/* disable _OSI(Linux) by default */
 
 #ifdef CONFIG_DMI
 static struct __initdata dmi_system_id acpi_osl_dmi_table[];