diff --git a/[refs] b/[refs]
index 6482e10e4eb9..4d6c4a4d739c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58d19d6ea608077e83c30e58ae1494246b1f6b82
+refs/heads/master: 7ae9e420de165c2a992d116002d05655138d8f24
diff --git a/trunk/arch/arm/mach-s3c2410/s3c2410-clock.c b/trunk/arch/arm/mach-s3c2410/s3c2410-clock.c
index 00abe199a08e..5815aa0f1463 100644
--- a/trunk/arch/arm/mach-s3c2410/s3c2410-clock.c
+++ b/trunk/arch/arm/mach-s3c2410/s3c2410-clock.c
@@ -31,12 +31,16 @@
 #include <linux/mutex.h>
 #include <linux/delay.h>
 
+#include <asm/mach/map.h>
+
 #include <asm/hardware.h>
 #include <asm/io.h>
 
+#include <asm/arch/regs-serial.h>
 #include <asm/arch/regs-clock.h>
 #include <asm/arch/regs-gpio.h>
 
+#include "s3c2410.h"
 #include "clock.h"
 #include "cpu.h"
 
diff --git a/trunk/arch/arm/mach-s3c2410/s3c2412-clock.c b/trunk/arch/arm/mach-s3c2410/s3c2412-clock.c
index c95ed3e18580..63f980cc2eb9 100644
--- a/trunk/arch/arm/mach-s3c2410/s3c2412-clock.c
+++ b/trunk/arch/arm/mach-s3c2410/s3c2412-clock.c
@@ -31,12 +31,16 @@
 #include <linux/mutex.h>
 #include <linux/delay.h>
 
+#include <asm/mach/map.h>
+
 #include <asm/hardware.h>
 #include <asm/io.h>
 
+#include <asm/arch/regs-serial.h>
 #include <asm/arch/regs-clock.h>
 #include <asm/arch/regs-gpio.h>
 
+#include "s3c2412.h"
 #include "clock.h"
 #include "cpu.h"
 
@@ -49,7 +53,7 @@
  * set the correct muxing at initialisation
 */
 
-int s3c2412_clkcon_enable(struct clk *clk, int enable)
+static int s3c2412_clkcon_enable(struct clk *clk, int enable)
 {
 	unsigned int clocks = clk->ctrlbit;
 	unsigned long clkcon;
@@ -556,7 +560,7 @@ struct clk_init {
 	struct clk	*src_1;
 };
 
-struct clk_init clks_src[] __initdata = {
+static struct clk_init clks_src[] __initdata = {
 	{
 		.clk	= &clk_usysclk,
 		.bit	= S3C2412_CLKSRC_USBCLK_HCLK,
@@ -619,7 +623,7 @@ static void __init s3c2412_clk_initparents(void)
 
 /* clocks to add straight away */
 
-struct clk *clks[] __initdata = {
+static struct clk *clks[] __initdata = {
 	&clk_ext,
 	&clk_usb_bus,
 	&clk_erefclk,