diff --git a/[refs] b/[refs]
index 146ff0cd6e8e..5c4b16d2fe32 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d5a2b54f39cab8ab8bee5290798ea6516c4a68c
+refs/heads/master: bfaed45e30f19bb4cee779f3229d2744bc2b2c46
diff --git a/trunk/drivers/acpi/osl.c b/trunk/drivers/acpi/osl.c
index 15e602377655..346f0494dbbb 100644
--- a/trunk/drivers/acpi/osl.c
+++ b/trunk/drivers/acpi/osl.c
@@ -419,7 +419,7 @@ acpi_os_table_override(struct acpi_table_header * existing_table,
 }
 
 #ifdef CONFIG_ACPI_CUSTOM_DSDT_INITRD
-int __init acpi_no_initrd_override_setup(char *s)
+static int __init acpi_no_initrd_override_setup(char *s)
 {
 	acpi_no_initrd_override = 1;
 	return 1;