2 files changed, 6 insertions, 0 deletions

diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index abf9179c9d03..f10af7faec98 100644
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@ -25,6 +25,7 @@ comment "S3C24XX SoCs"
 config CPU_S3C2410
         bool "SAMSUNG S3C2410"
         default y
+        depends on SAMSUNG_CLOCK
         select CPU_ARM920T
         select CPU_LLSERIAL_S3C2410
         select S3C2410_CLOCK
@@ -38,6 +39,7 @@ config CPU_S3C2410
 
 config CPU_S3C2412
         bool "SAMSUNG S3C2412"
+        depends on SAMSUNG_CLOCK
         select CPU_ARM926T
         select CPU_LLSERIAL_S3C2440
         select S3C2412_DMA if S3C24XX_DMA
@@ -58,6 +60,7 @@ config CPU_S3C2416
 
 config CPU_S3C2440
         bool "SAMSUNG S3C2440"
+        depends on SAMSUNG_CLOCK
         select CPU_ARM920T
         select CPU_LLSERIAL_S3C2440
         select S3C2410_CLOCK
@@ -68,6 +71,7 @@ config CPU_S3C2440
 
 config CPU_S3C2442
         bool "SAMSUNG S3C2442"
+        depends on SAMSUNG_CLOCK
         select CPU_ARM920T
         select CPU_LLSERIAL_S3C2440
         select S3C2410_CLOCK
diff --git a/arch/arm/mach-s3c24xx/common.c b/arch/arm/mach-s3c24xx/common.c
index 1bc8e73c94f9..0fc6641ac57d 100644
--- a/arch/arm/mach-s3c24xx/common.c
+++ b/arch/arm/mach-s3c24xx/common.c
@@ -318,6 +318,7 @@ struct s3c24xx_uart_resources s3c2410_uart_resources[] __initdata = {
 
 /* initialise all the clocks */
 
+#ifdef CONFIG_SAMSUNG_CLOCK
 void __init_or_cpufreq s3c24xx_setup_clocks(unsigned long fclk,
                                            unsigned long hclk,
                                            unsigned long pclk)
@@ -330,6 +331,7 @@ void __init_or_cpufreq s3c24xx_setup_clocks(unsigned long fclk,
         clk_p.rate = pclk;
         clk_f.rate = fclk;
 }
+#endif
 
 #if defined(CONFIG_CPU_S3C2410) || defined(CONFIG_CPU_S3C2412) || \
         defined(CONFIG_CPU_S3C2440) || defined(CONFIG_CPU_S3C2442)