diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-26 14:34:08 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-26 14:35:56 +0100 |
| commit | 3b900d44190c7da8681101c57a5be6b354dab2c7 (patch) | |
| tree | 459552f657ba4bd12eb2371be563b320d7d119f9 /arch/x86/kernel/apic/es7000_32.c | |
| parent | 0b1da1c8fc1a0cb71f17701efad06855a059f752 (diff) | |
| download | blackbird-op-linux-3b900d44190c7da8681101c57a5be6b354dab2c7.tar.gz blackbird-op-linux-3b900d44190c7da8681101c57a5be6b354dab2c7.zip | |
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>
Diffstat (limited to 'arch/x86/kernel/apic/es7000_32.c')
| -rw-r--r-- | arch/x86/kernel/apic/es7000_32.c | 11 |
1 files changed, 9 insertions, 2 deletions
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) |
