From 8fff72e3d8e54d06ffaac5c6fbfad682e315f684 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Wed, 6 Feb 2008 01:36:28 -0800
Subject: [PATCH] --- yaml --- r: 83390 b: refs/heads/master c:
 33b5f31bbc4d047d048d8635fccdab38ffe6c287 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/base/cpu.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ae8296f8d73d..8fe7cde26cfe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96c5865559cee0f9cbc5173f3c949f6ce3525581
+refs/heads/master: 33b5f31bbc4d047d048d8635fccdab38ffe6c287
diff --git a/trunk/drivers/base/cpu.c b/trunk/drivers/base/cpu.c
index c5885f5ce0ac..499b003f9278 100644
--- a/trunk/drivers/base/cpu.c
+++ b/trunk/drivers/base/cpu.c
@@ -110,7 +110,7 @@ static SYSDEV_ATTR(crash_notes, 0400, show_crash_notes, NULL);
  *
  * Initialize and register the CPU device.
  */
-int __devinit register_cpu(struct cpu *cpu, int num)
+int __cpuinit register_cpu(struct cpu *cpu, int num)
 {
 	int error;
 	cpu->node_id = cpu_to_node(num);