diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-02-26 08:34:08 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-26 08:35:56 -0500 |
commit | 3b900d44190c7da8681101c57a5be6b354dab2c7 (patch) | |
tree | 459552f657ba4bd12eb2371be563b320d7d119f9 /arch | |
parent | 0b1da1c8fc1a0cb71f17701efad06855a059f752 (diff) |
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')
-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 b4838ed3f26..da37e2c59fe 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) | |||
332 | 332 | ||
333 | return ret && !es7000_apic_is_cluster(); | 333 | return ret && !es7000_apic_is_cluster(); |
334 | } | 334 | } |
335 | static int __init es7000_acpi_madt_oem_check_cluster(char *oem_id, | 335 | |
336 | char *oem_table_id) | 336 | static int __init |
337 | es7000_acpi_madt_oem_check_cluster(char *oem_id, char *oem_table_id) | ||
337 | { | 338 | { |
338 | int ret = es7000_acpi_ret; | 339 | int ret = es7000_acpi_ret; |
339 | 340 | ||
@@ -345,6 +346,12 @@ static int __init es7000_acpi_madt_oem_check(char *oem_id, char *oem_table_id) | |||
345 | { | 346 | { |
346 | return 0; | 347 | return 0; |
347 | } | 348 | } |
349 | |||
350 | static int __init | ||
351 | es7000_acpi_madt_oem_check_cluster(char *oem_id, char *oem_table_id) | ||
352 | { | ||
353 | return 0; | ||
354 | } | ||
348 | #endif /* !CONFIG_ACPI */ | 355 | #endif /* !CONFIG_ACPI */ |
349 | 356 | ||
350 | static void es7000_spin(int n) | 357 | static void es7000_spin(int n) |