summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/genx2apic_phys.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-10-27 12:38:02 +0100
committerIngo Molnar <mingo@elte.hu>2008-10-27 12:38:02 +0100
commit5292ae11babca23c3ff82593630d2d7eebc350a9 (patch)
tree30a6c8123b35686098f306ea39398b7621f42054 /arch/x86/kernel/genx2apic_phys.c
parentx86, uv: use consistent names for region size and conherence id on x86 and ia64 (diff)
parentLinux 2.6.28-rc2 (diff)
downloadlinux-5292ae11babca23c3ff82593630d2d7eebc350a9.tar.xz
linux-5292ae11babca23c3ff82593630d2d7eebc350a9.zip
Merge commit 'v2.6.28-rc2' into x86/uv
Diffstat (limited to 'arch/x86/kernel/genx2apic_phys.c')
-rw-r--r--arch/x86/kernel/genx2apic_phys.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/genx2apic_phys.c b/arch/x86/kernel/genx2apic_phys.c
index 8f1343df2627..d042211768b7 100644
--- a/arch/x86/kernel/genx2apic_phys.c
+++ b/arch/x86/kernel/genx2apic_phys.c
@@ -19,7 +19,7 @@ static int set_x2apic_phys_mode(char *arg)
}
early_param("x2apic_phys", set_x2apic_phys_mode);
-static int __init x2apic_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
+static int x2apic_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
{
if (cpu_has_x2apic && x2apic_phys)
return 1;