From 1c704ab5722df6393a4b003bc62a6cb17079359f Mon Sep 17 00:00:00 2001
From: Matt Fleming <matt@console-pimps.org>
Date: Wed, 28 Apr 2010 11:11:30 +0000
Subject: [PATCH] --- yaml --- r: 191648 b: refs/heads/master c:
 1483feac74fdfd84a7ed7586c66482842e3b6e86 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 6649be79abd3..41d34bbda3d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f737b39be9110bd64874f508bd89ba27746b17e
+refs/heads/master: 1483feac74fdfd84a7ed7586c66482842e3b6e86
diff --git a/trunk/arch/sh/kernel/smp.c b/trunk/arch/sh/kernel/smp.c
index 86cd6f94b53b..509b36b45115 100644
--- a/trunk/arch/sh/kernel/smp.c
+++ b/trunk/arch/sh/kernel/smp.c
@@ -161,7 +161,7 @@ int __cpu_disable(void)
 	return 0;
 }
 #else /* ... !CONFIG_HOTPLUG_CPU */
-int native_cpu_disable(void)
+int native_cpu_disable(unsigned int cpu)
 {
 	return -ENOSYS;
 }