From 7646b7b7da251ccbd8de7c3ab99e56428ba5f371 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 12 Jul 2012 16:57:19 +0900
Subject: [PATCH] --- yaml --- r: 313203 b: refs/heads/master c:
 2aa1ecf731fc4211a6b453167dff44c778789743 h: refs/heads/master i:   313201:
 6ce9df79092cc7711c183b01cc1eec8fc5d7d210   313199:
 1d221ccb387786933e31fa2680362868dc6af4eb v: v3

---
 [refs]                               | 2 +-
 trunk/arch/arm/plat-samsung/Kconfig  | 4 ++++
 trunk/arch/arm/plat-samsung/Makefile | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c83afc478e90..27e15778fcba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12f081ffeefbebac085dc6e2138cd06e4803d9a0
+refs/heads/master: 2aa1ecf731fc4211a6b453167dff44c778789743
diff --git a/trunk/arch/arm/plat-samsung/Kconfig b/trunk/arch/arm/plat-samsung/Kconfig
index a2fae4ea0936..9b4cfd412b1b 100644
--- a/trunk/arch/arm/plat-samsung/Kconfig
+++ b/trunk/arch/arm/plat-samsung/Kconfig
@@ -78,6 +78,10 @@ config S5P_HRT
 
 # clock options
 
+config SAMSUNG_CLOCK
+	bool
+	default y if !COMMON_CLK
+
 config SAMSUNG_CLKSRC
 	bool
 	help
diff --git a/trunk/arch/arm/plat-samsung/Makefile b/trunk/arch/arm/plat-samsung/Makefile
index 860b2db4db15..abf2f3b66988 100644
--- a/trunk/arch/arm/plat-samsung/Makefile
+++ b/trunk/arch/arm/plat-samsung/Makefile
@@ -15,8 +15,8 @@ obj-y				+= init.o cpu.o
 obj-$(CONFIG_ARCH_USES_GETTIMEOFFSET)   += time.o
 obj-$(CONFIG_S5P_HRT) 		+= s5p-time.o
 
-obj-y				+= clock.o
-obj-y				+= pwm-clock.o
+obj-$(CONFIG_SAMSUNG_CLOCK)	+= clock.o
+obj-$(CONFIG_SAMSUNG_CLOCK)	+= pwm-clock.o
 
 obj-$(CONFIG_SAMSUNG_CLKSRC)	+= clock-clksrc.o
 obj-$(CONFIG_S5P_CLOCK)		+= s5p-clock.o