From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 26 Feb 2009 13:34:08 +0000 (+0100)
Subject: x86: fix !ACPI build for es7000_32.c
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=3b900d44190c7da8681101c57a5be6b354dab2c7;p=openwrt%2Fstaging%2Fblogic.git

x86: fix !ACPI build for es7000_32.c

arch/x86/kernel/apic/es7000_32.c:702: error: 'es7000_acpi_madt_oem_check_cluster' undeclared here (not in a function)

Provide a es7000_acpi_madt_oem_check_cluster() definition in the !ACPI
case too.

Cc: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/kernel/apic/es7000_32.c b/arch/x86/kernel/apic/es7000_32.c
index b4838ed3f26a..da37e2c59fe1 100644
--- a/arch/x86/kernel/apic/es7000_32.c
+++ b/arch/x86/kernel/apic/es7000_32.c
@@ -332,8 +332,9 @@ static int __init es7000_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
 
 	return ret && !es7000_apic_is_cluster();
 }
-static int __init es7000_acpi_madt_oem_check_cluster(char *oem_id,
-						     char *oem_table_id)
+
+static int __init
+es7000_acpi_madt_oem_check_cluster(char *oem_id, char *oem_table_id)
 {
 	int ret = es7000_acpi_ret;
 
@@ -345,6 +346,12 @@ static int __init es7000_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
 {
 	return 0;
 }
+
+static int __init
+es7000_acpi_madt_oem_check_cluster(char *oem_id, char *oem_table_id)
+{
+	return 0;
+}
 #endif /* !CONFIG_ACPI */
 
 static void es7000_spin(int n)