git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb...
[pandora-kernel.git]
/
arch
/
sh
/
kernel
/
idle.c
diff --git
a/arch/sh/kernel/idle.c
b/arch/sh/kernel/idle.c
index
9c7099e
..
3c45de1
100644
(file)
--- a/
arch/sh/kernel/idle.c
+++ b/
arch/sh/kernel/idle.c
@@
-19,7
+19,7
@@
#include <linux/cpuidle.h>
#include <asm/pgalloc.h>
#include <asm/system.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
#include <asm/smp.h>
static void (*pm_idle)(void);