projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.14.25' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
arch
/
arm
/
mach-shmobile
/
clock.c
diff --git
a/arch/arm/mach-shmobile/clock.c
b/arch/arm/mach-shmobile/clock.c
index
2a58a78
..
806f940
100644
(file)
--- a/
arch/arm/mach-shmobile/clock.c
+++ b/
arch/arm/mach-shmobile/clock.c
@@
-49,8
+49,8
@@
void __init shmobile_clk_workaround(const struct clk_name *clks,
#else /* CONFIG_COMMON_CLK */
#include <linux/sh_clk.h>
#include <linux/export.h>
-#include <mach/common.h>
#include "clock.h"
+#include "common.h"
unsigned long shmobile_fixed_ratio_clk_recalc(struct clk *clk)
{