summaryrefslogtreecommitdiff
path: root/include/asm-i386/mach-default/mach_apic.h
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-05-08 03:37:51 (GMT)
committerPaul Mackerras <paulus@samba.org>2007-05-08 03:37:51 (GMT)
commit02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1 (patch)
tree04ef573cd4de095c500c9fc3477f4278c0b36300 /include/asm-i386/mach-default/mach_apic.h
parent7487a2245b8841c77ba9db406cf99a483b9334e9 (diff)
parent5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff)
downloadlinux-fsl-qoriq-02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1.tar.xz
Merge branch 'linux-2.6'
Diffstat (limited to 'include/asm-i386/mach-default/mach_apic.h')
-rw-r--r--include/asm-i386/mach-default/mach_apic.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-i386/mach-default/mach_apic.h b/include/asm-i386/mach-default/mach_apic.h
index 3ef6292..6db1c3b 100644
--- a/include/asm-i386/mach-default/mach_apic.h
+++ b/include/asm-i386/mach-default/mach_apic.h
@@ -54,7 +54,7 @@ static inline physid_mask_t ioapic_phys_id_map(physid_mask_t phys_map)
return phys_map;
}
-static inline void clustered_apic_check(void)
+static inline void setup_apic_routing(void)
{
printk("Enabling APIC mode: %s. Using %d I/O APICs\n",
"Flat", nr_ioapics);