git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-s5pv210
/
pm.c
diff --git
a/arch/arm/mach-s5pv210/pm.c
b/arch/arm/mach-s5pv210/pm.c
index 123163dd2ab0b394c100eda6c828cf644fb3e495..21b4b13c5ab787f0707c00c5125b285f73dcdd60 100644
(file)
--- a/
arch/arm/mach-s5pv210/pm.c
+++ b/
arch/arm/mach-s5pv210/pm.c
@@
-24,9
+24,8
@@
#include <plat/pm-common.h>
-#include <mach/regs-clock.h>
-
#include "common.h"
+#include "regs-clock.h"
static struct sleep_save s5pv210_core_save[] = {
/* Clock ETC */