diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-09-01 01:57:23 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-09-01 01:57:32 -0400 |
| commit | 7bfb40b048aa709bb88a00a1acbadbd9f7a645ee (patch) | |
| tree | 88cfef3d3facca564ad378553a838789e0c78cb1 /arch/sh/kernel/idle.c | |
| parent | 9bb7361d99fb5c510e62b521e4292581fa1bee98 (diff) | |
| parent | 9e79e3e9dd9672b37ac9412e9a926714306551fe (diff) | |
Merge remote-tracking branch 'origin/master' into next
(Pickup Stephen's fix d4d7b2a11c423a8d4088bb0090e4c8d626d043bc)
Diffstat (limited to 'arch/sh/kernel/idle.c')
| -rw-r--r-- | arch/sh/kernel/idle.c | 2 |
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 @@ | |||
| 22 | #include <linux/atomic.h> | 22 | #include <linux/atomic.h> |
| 23 | #include <asm/smp.h> | 23 | #include <asm/smp.h> |
| 24 | 24 | ||
| 25 | static void (*pm_idle)(void); | 25 | void (*pm_idle)(void); |
| 26 | 26 | ||
| 27 | static int hlt_counter; | 27 | static int hlt_counter; |
| 28 | 28 | ||