From fa4a322ae6cf23abdf081652f4082d8fa2707f8e Mon Sep 17 00:00:00 2001
From: Tony Luck <tony.luck@intel.com>
Date: Thu, 24 May 2007 10:59:44 -0700
Subject: [PATCH] --- yaml --- r: 56960 b: refs/heads/master c:
 d57c4a38928ab2f71542046a9bae2932006b2523 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/arch/ia64/kernel/acpi.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e72177def91c..6be929bd5ca9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35729449655abcceeb3c72181e9920cf98f81c1e
+refs/heads/master: d57c4a38928ab2f71542046a9bae2932006b2523
diff --git a/trunk/arch/ia64/kernel/acpi.c b/trunk/arch/ia64/kernel/acpi.c
index c4784494970e..103dd8edda71 100644
--- a/trunk/arch/ia64/kernel/acpi.c
+++ b/trunk/arch/ia64/kernel/acpi.c
@@ -67,7 +67,8 @@ EXPORT_SYMBOL(pm_power_off);
 unsigned int acpi_cpei_override;
 unsigned int acpi_cpei_phys_cpuid;
 
-const char *acpi_get_sysname(void)
+const char __init *
+acpi_get_sysname(void)
 {
 #ifdef CONFIG_IA64_GENERIC
 	unsigned long rsdp_phys;