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; }