projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for_3.17-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-shmobile
/
pm-rmobile.c
diff --git
a/arch/arm/mach-shmobile/pm-rmobile.c
b/arch/arm/mach-shmobile/pm-rmobile.c
index f710235aff2fad5addfb2f0a65363ccf26bfa93f..ebdd16e94a84f5d674f691edfc99e6712d7cee28 100644
(file)
--- a/
arch/arm/mach-shmobile/pm-rmobile.c
+++ b/
arch/arm/mach-shmobile/pm-rmobile.c
@@
-17,7
+17,7
@@
#include <linux/pm.h>
#include <linux/pm_clock.h>
#include <asm/io.h>
-#include
<mach/pm-rmobile.h>
+#include
"pm-rmobile.h"
/* SYSC */
#define SPDCR IOMEM(0xe6180008)