From b96dd66dced44f31843785abd3ba9b692d12ed60 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Wed, 13 Feb 2008 23:30:00 +0200
Subject: [PATCH] --- yaml --- r: 85571 b: refs/heads/master c:
 bfaed45e30f19bb4cee779f3229d2744bc2b2c46 h: refs/heads/master i:   85569:
 357c4538303b3147b10e28bb33649e5eb17d71d2   85567:
 6f863b6180a1fdc9eff2f8f249f9844928d71855 v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/acpi/osl.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;