From 0b2d1d1a030522a54f30c07aa5c207688504e60f Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Tue, 7 Mar 2006 23:53:25 -0800
Subject: [PATCH] --- yaml --- r: 22015 b: refs/heads/master c:
 a29d642a4aa99c5234314ab2523281139226c231 h: refs/heads/master i:   22013:
 520d9167582a2a507ba4a60767cf6cd07891e214   22011:
 29b1fc0ef2137280e472b0230d3d26c1cb9f0dac   22007:
 40dfe12bc3309b5cbb56c40678137d3516a823ec   21999:
 0e4be435deb9983ad63c3426d6c8029faf430094   21983:
 f09399a88c26f8a6d375492ccc8c21476bac440e   21951:
 a1d178061e546f3fd479c604bd6756005b9b4734   21887:
 fafa13477b61dd12ed8b8ccf03e99a940ee6fde9   21759:
 38ff71a22b76be6cd240d558813c275ac9c53d0d   21503:
 f10775e2cb34d2b69e366cd0dc016f6f54c462d8 v: v3

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

diff --git a/[refs] b/[refs]
index efe432c547f8..317372371c15 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7423172a50968de1905a61413c52bb070a62f5ce
+refs/heads/master: a29d642a4aa99c5234314ab2523281139226c231
diff --git a/trunk/drivers/base/cpu.c b/trunk/drivers/base/cpu.c
index 07a7f97e1de9..29f3d7504da1 100644
--- a/trunk/drivers/base/cpu.c
+++ b/trunk/drivers/base/cpu.c
@@ -141,7 +141,7 @@ int __devinit register_cpu(struct cpu *cpu, int num, struct node *root)
 	return error;
 }
 
-struct sys_device *get_cpu_sysdev(int cpu)
+struct sys_device *get_cpu_sysdev(unsigned cpu)
 {
 	if (cpu < NR_CPUS)
 		return cpu_sys_devices[cpu];
diff --git a/trunk/include/linux/cpu.h b/trunk/include/linux/cpu.h
index 0ed1d4853c69..d612b89dce33 100644
--- a/trunk/include/linux/cpu.h
+++ b/trunk/include/linux/cpu.h
@@ -32,7 +32,7 @@ struct cpu {
 };
 
 extern int register_cpu(struct cpu *, int, struct node *);
-extern struct sys_device *get_cpu_sysdev(int cpu);
+extern struct sys_device *get_cpu_sysdev(unsigned cpu);
 #ifdef CONFIG_HOTPLUG_CPU
 extern void unregister_cpu(struct cpu *, struct node *);
 #endif