From 39824e68de308eb4a30fe6e779eed65ad1ede420 Mon Sep 17 00:00:00 2001
From: Kukjin Kim <kgene.kim@samsung.com>
Date: Tue, 1 Jan 2013 19:14:00 -0800
Subject: [PATCH] --- yaml --- r: 355251 b: refs/heads/master c:
 2d8c8a02830de5e042922c33dcc9de08699e5e24 h: refs/heads/master i:   355249:
 269c427027739e16b3159a8146408d15b10186ca   355247:
 6e96f14624aad9a02e7cd8614995a500e30d2f29 v: v3

---
 [refs]                                                   | 2 +-
 trunk/arch/arm/mach-s5p64x0/clock-s5p6440.c              | 2 +-
 trunk/arch/arm/mach-s5p64x0/clock-s5p6450.c              | 2 +-
 .../{include/mach/s5p64x0-clock.h => clock.h}            | 9 ++++-----
 4 files changed, 7 insertions(+), 8 deletions(-)
 rename trunk/arch/arm/mach-s5p64x0/{include/mach/s5p64x0-clock.h => clock.h} (87%)

diff --git a/[refs] b/[refs]
index 1f235fbdb287..f4ca3001c289 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 102c3065739c933289ab67492d7dde0d40fc2369
+refs/heads/master: 2d8c8a02830de5e042922c33dcc9de08699e5e24
diff --git a/trunk/arch/arm/mach-s5p64x0/clock-s5p6440.c b/trunk/arch/arm/mach-s5p64x0/clock-s5p6440.c
index 5112371079d0..3537815247f1 100644
--- a/trunk/arch/arm/mach-s5p64x0/clock-s5p6440.c
+++ b/trunk/arch/arm/mach-s5p64x0/clock-s5p6440.c
@@ -23,7 +23,6 @@
 #include <mach/hardware.h>
 #include <mach/map.h>
 #include <mach/regs-clock.h>
-#include <mach/s5p64x0-clock.h>
 
 #include <plat/cpu-freq.h>
 #include <plat/clock.h>
@@ -32,6 +31,7 @@
 #include <plat/s5p-clock.h>
 #include <plat/clock-clksrc.h>
 
+#include "clock.h"
 #include "common.h"
 
 static u32 epll_div[][5] = {
diff --git a/trunk/arch/arm/mach-s5p64x0/clock-s5p6450.c b/trunk/arch/arm/mach-s5p64x0/clock-s5p6450.c
index 154dea702d70..af384ddd2dcf 100644
--- a/trunk/arch/arm/mach-s5p64x0/clock-s5p6450.c
+++ b/trunk/arch/arm/mach-s5p64x0/clock-s5p6450.c
@@ -23,7 +23,6 @@
 #include <mach/hardware.h>
 #include <mach/map.h>
 #include <mach/regs-clock.h>
-#include <mach/s5p64x0-clock.h>
 
 #include <plat/cpu-freq.h>
 #include <plat/clock.h>
@@ -32,6 +31,7 @@
 #include <plat/s5p-clock.h>
 #include <plat/clock-clksrc.h>
 
+#include "clock.h"
 #include "common.h"
 
 static struct clksrc_clk clk_mout_dpll = {
diff --git a/trunk/arch/arm/mach-s5p64x0/include/mach/s5p64x0-clock.h b/trunk/arch/arm/mach-s5p64x0/clock.h
similarity index 87%
rename from trunk/arch/arm/mach-s5p64x0/include/mach/s5p64x0-clock.h
rename to trunk/arch/arm/mach-s5p64x0/clock.h
index 0ef47d1b7670..28b8e3c6bd24 100644
--- a/trunk/arch/arm/mach-s5p64x0/include/mach/s5p64x0-clock.h
+++ b/trunk/arch/arm/mach-s5p64x0/clock.h
@@ -1,5 +1,4 @@
-/* linux/arch/arm/mach-s5p64x0/include/mach/s5p64x0-clock.h
- *
+/*
  * Copyright (c) 2010 Samsung Electronics Co., Ltd.
  *		http://www.samsung.com
  *
@@ -10,8 +9,8 @@
  * published by the Free Software Foundation.
 */
 
-#ifndef __ASM_ARCH_CLOCK_H
-#define __ASM_ARCH_CLOCK_H __FILE__
+#ifndef __MACH_S5P64X0_CLOCK_H
+#define __MACH_S5P64X0_CLOCK_H __FILE__
 
 #include <linux/clk.h>
 
@@ -36,4 +35,4 @@ extern int s5p64x0_mem_ctrl(struct clk *clk, int enable);
 
 extern int s5p64x0_clk48m_ctrl(struct clk *clk, int enable);
 
-#endif /* __ASM_ARCH_CLOCK_H */
+#endif /* __MACH_S5P64X0_CLOCK_H */