Browse Source

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>
Ingo Molnar 16 years ago
parent
commit
3b900d4419
1 changed files with 9 additions and 2 deletions
  1. 9 2
      arch/x86/kernel/apic/es7000_32.c

+ 9 - 2
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();
 	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;
 	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;
 	return 0;
 }
 }
+
+static int __init
+es7000_acpi_madt_oem_check_cluster(char *oem_id, char *oem_table_id)
+{
+	return 0;
+}
 #endif /* !CONFIG_ACPI */
 #endif /* !CONFIG_ACPI */
 
 
 static void es7000_spin(int n)
 static void es7000_spin(int n)