summaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-08-08 09:30:11 +0200
committerPaul Mundt <lethal@linux-sh.org>2011-08-08 09:30:11 +0200
commitc66d3fcbf306af3c0c4b6f4e0d81467f89c67702 (patch)
treeeadabd1b92288ff8a86b696ec2d0b8e52717ea9f /arch/sh
parentMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval... (diff)
downloadlinux-c66d3fcbf306af3c0c4b6f4e0d81467f89c67702.tar.xz
linux-c66d3fcbf306af3c0c4b6f4e0d81467f89c67702.zip
sh: Fix up fallout from cpuidle changes.
Fixes up the pm_idle redefinition that was introduced with the earlier cpuidle changes. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/kernel/idle.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/idle.c b/arch/sh/kernel/idle.c
index 32114e0941ae..db4ecd731a00 100644
--- a/arch/sh/kernel/idle.c
+++ b/arch/sh/kernel/idle.c
@@ -22,7 +22,7 @@
#include <linux/atomic.h>
#include <asm/smp.h>
-static void (*pm_idle)(void);
+void (*pm_idle)(void);
static int hlt_counter;