diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2013-01-01 22:14:00 -0500 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-01-10 13:45:17 -0500 |
commit | 2d8c8a02830de5e042922c33dcc9de08699e5e24 (patch) | |
tree | 67fea7faedf60cc8fc243452b079d944209254c5 /arch/arm/mach-s5p64x0 | |
parent | 102c3065739c933289ab67492d7dde0d40fc2369 (diff) |
ARM: S5P64X0: move s5p64x0-clock.h into local directory
The <mach/s5p64x0-clock.h> can be moved into mach-s5p64x0/.
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-s5p64x0')
-rw-r--r-- | arch/arm/mach-s5p64x0/clock-s5p6440.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s5p64x0/clock-s5p6450.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s5p64x0/clock.h (renamed from arch/arm/mach-s5p64x0/include/mach/s5p64x0-clock.h) | 9 |
3 files changed, 6 insertions, 7 deletions
diff --git a/arch/arm/mach-s5p64x0/clock-s5p6440.c b/arch/arm/mach-s5p64x0/clock-s5p6440.c index 5112371079d0..3537815247f1 100644 --- a/arch/arm/mach-s5p64x0/clock-s5p6440.c +++ b/arch/arm/mach-s5p64x0/clock-s5p6440.c | |||
@@ -23,7 +23,6 @@ | |||
23 | #include <mach/hardware.h> | 23 | #include <mach/hardware.h> |
24 | #include <mach/map.h> | 24 | #include <mach/map.h> |
25 | #include <mach/regs-clock.h> | 25 | #include <mach/regs-clock.h> |
26 | #include <mach/s5p64x0-clock.h> | ||
27 | 26 | ||
28 | #include <plat/cpu-freq.h> | 27 | #include <plat/cpu-freq.h> |
29 | #include <plat/clock.h> | 28 | #include <plat/clock.h> |
@@ -32,6 +31,7 @@ | |||
32 | #include <plat/s5p-clock.h> | 31 | #include <plat/s5p-clock.h> |
33 | #include <plat/clock-clksrc.h> | 32 | #include <plat/clock-clksrc.h> |
34 | 33 | ||
34 | #include "clock.h" | ||
35 | #include "common.h" | 35 | #include "common.h" |
36 | 36 | ||
37 | static u32 epll_div[][5] = { | 37 | static u32 epll_div[][5] = { |
diff --git a/arch/arm/mach-s5p64x0/clock-s5p6450.c b/arch/arm/mach-s5p64x0/clock-s5p6450.c index 154dea702d70..af384ddd2dcf 100644 --- a/arch/arm/mach-s5p64x0/clock-s5p6450.c +++ b/arch/arm/mach-s5p64x0/clock-s5p6450.c | |||
@@ -23,7 +23,6 @@ | |||
23 | #include <mach/hardware.h> | 23 | #include <mach/hardware.h> |
24 | #include <mach/map.h> | 24 | #include <mach/map.h> |
25 | #include <mach/regs-clock.h> | 25 | #include <mach/regs-clock.h> |
26 | #include <mach/s5p64x0-clock.h> | ||
27 | 26 | ||
28 | #include <plat/cpu-freq.h> | 27 | #include <plat/cpu-freq.h> |
29 | #include <plat/clock.h> | 28 | #include <plat/clock.h> |
@@ -32,6 +31,7 @@ | |||
32 | #include <plat/s5p-clock.h> | 31 | #include <plat/s5p-clock.h> |
33 | #include <plat/clock-clksrc.h> | 32 | #include <plat/clock-clksrc.h> |
34 | 33 | ||
34 | #include "clock.h" | ||
35 | #include "common.h" | 35 | #include "common.h" |
36 | 36 | ||
37 | static struct clksrc_clk clk_mout_dpll = { | 37 | static struct clksrc_clk clk_mout_dpll = { |
diff --git a/arch/arm/mach-s5p64x0/include/mach/s5p64x0-clock.h b/arch/arm/mach-s5p64x0/clock.h index 0ef47d1b7670..28b8e3c6bd24 100644 --- a/arch/arm/mach-s5p64x0/include/mach/s5p64x0-clock.h +++ b/arch/arm/mach-s5p64x0/clock.h | |||
@@ -1,5 +1,4 @@ | |||
1 | /* linux/arch/arm/mach-s5p64x0/include/mach/s5p64x0-clock.h | 1 | /* |
2 | * | ||
3 | * Copyright (c) 2010 Samsung Electronics Co., Ltd. | 2 | * Copyright (c) 2010 Samsung Electronics Co., Ltd. |
4 | * http://www.samsung.com | 3 | * http://www.samsung.com |
5 | * | 4 | * |
@@ -10,8 +9,8 @@ | |||
10 | * published by the Free Software Foundation. | 9 | * published by the Free Software Foundation. |
11 | */ | 10 | */ |
12 | 11 | ||
13 | #ifndef __ASM_ARCH_CLOCK_H | 12 | #ifndef __MACH_S5P64X0_CLOCK_H |
14 | #define __ASM_ARCH_CLOCK_H __FILE__ | 13 | #define __MACH_S5P64X0_CLOCK_H __FILE__ |
15 | 14 | ||
16 | #include <linux/clk.h> | 15 | #include <linux/clk.h> |
17 | 16 | ||
@@ -36,4 +35,4 @@ extern int s5p64x0_mem_ctrl(struct clk *clk, int enable); | |||
36 | 35 | ||
37 | extern int s5p64x0_clk48m_ctrl(struct clk *clk, int enable); | 36 | extern int s5p64x0_clk48m_ctrl(struct clk *clk, int enable); |
38 | 37 | ||
39 | #endif /* __ASM_ARCH_CLOCK_H */ | 38 | #endif /* __MACH_S5P64X0_CLOCK_H */ |