From 3798e57ba03ac9854746c689b281ab3356426400 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Wed, 19 Dec 2007 23:20:18 +0100
Subject: [PATCH] --- yaml --- r: 75095 b: refs/heads/master c:
 d53379832624c0ecab7f46749c8b72e49a88d160 h: refs/heads/master i:   75093:
 19bc0508cd4e2cf714cb2d94d8beab733330e312   75091:
 8eb0050b23bf5870d6b0cbd3e3ac5385b927d4af   75087:
 c5fab569df50222a7d73496a4e22177d052999a7 v: v3

---
 [refs]                          | 2 +-
 trunk/arch/x86/kernel/apic_32.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 071be9871fdc..cf6699936273 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4486c5f510463673d2ea57b46137086f5b21ef36
+refs/heads/master: d53379832624c0ecab7f46749c8b72e49a88d160
diff --git a/trunk/arch/x86/kernel/apic_32.c b/trunk/arch/x86/kernel/apic_32.c
index 96986b46bc85..edb5108e5d0e 100644
--- a/trunk/arch/x86/kernel/apic_32.c
+++ b/trunk/arch/x86/kernel/apic_32.c
@@ -849,7 +849,7 @@ void __init init_bsp_APIC(void)
 /**
  * setup_local_APIC - setup the local APIC
  */
-void __devinit setup_local_APIC(void)
+void __cpuinit setup_local_APIC(void)
 {
 	unsigned long oldvalue, value, maxlvt, integrated;
 	int i, j;