Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

[sfrench/cifs-2.6.git] / drivers / clk / samsung / Makefile

diff --git a/drivers/clk/samsung/Makefile b/drivers/clk/samsung/Makefile
index 6891b087acff26fee30342289fe559ee3931b8e8..028b2e27a37e672f4f1eaf502295b7872bd01f1b 100644 (file)
--- a/drivers/clk/samsung/Makefile
+++ b/drivers/clk/samsung/Makefile
@@ -4,15 +4,15 @@
 #
 
 obj-$(CONFIG_COMMON_CLK)       += clk.o clk-pll.o clk-cpu.o
-obj-$(CONFIG_SOC_EXYNOS3250)   += clk-exynos3250.o
-obj-$(CONFIG_ARCH_EXYNOS4)     += clk-exynos4.o
-obj-$(CONFIG_ARCH_EXYNOS4)     += clk-exynos4412-isp.o
-obj-$(CONFIG_SOC_EXYNOS5250)   += clk-exynos5250.o
-obj-$(CONFIG_SOC_EXYNOS5250)   += clk-exynos5-subcmu.o
-obj-$(CONFIG_SOC_EXYNOS5260)   += clk-exynos5260.o
-obj-$(CONFIG_SOC_EXYNOS5410)   += clk-exynos5410.o
-obj-$(CONFIG_SOC_EXYNOS5420)   += clk-exynos5420.o
-obj-$(CONFIG_SOC_EXYNOS5420)   += clk-exynos5-subcmu.o
+obj-$(CONFIG_EXYNOS_3250_COMMON_CLK)   += clk-exynos3250.o
+obj-$(CONFIG_EXYNOS_4_COMMON_CLK)      += clk-exynos4.o
+obj-$(CONFIG_EXYNOS_4_COMMON_CLK)      += clk-exynos4412-isp.o
+obj-$(CONFIG_EXYNOS_5250_COMMON_CLK)   += clk-exynos5250.o
+obj-$(CONFIG_EXYNOS_5250_COMMON_CLK)   += clk-exynos5-subcmu.o
+obj-$(CONFIG_EXYNOS_5260_COMMON_CLK)   += clk-exynos5260.o
+obj-$(CONFIG_EXYNOS_5410_COMMON_CLK)   += clk-exynos5410.o
+obj-$(CONFIG_EXYNOS_5420_COMMON_CLK)   += clk-exynos5420.o
+obj-$(CONFIG_EXYNOS_5420_COMMON_CLK)   += clk-exynos5-subcmu.o
 obj-$(CONFIG_EXYNOS_ARM64_COMMON_CLK)  += clk-exynos5433.o
 obj-$(CONFIG_EXYNOS_AUDSS_CLK_CON) += clk-exynos-audss.o
 obj-$(CONFIG_EXYNOS_CLKOUT)    += clk-exynos-clkout.o
@@ -21,5 +21,5 @@ obj-$(CONFIG_S3C2410_COMMON_CLK)+= clk-s3c2410.o
 obj-$(CONFIG_S3C2410_COMMON_DCLK)+= clk-s3c2410-dclk.o
 obj-$(CONFIG_S3C2412_COMMON_CLK)+= clk-s3c2412.o
 obj-$(CONFIG_S3C2443_COMMON_CLK)+= clk-s3c2443.o
-obj-$(CONFIG_ARCH_S3C64XX)     += clk-s3c64xx.o
-obj-$(CONFIG_ARCH_S5PV210)     += clk-s5pv210.o clk-s5pv210-audss.o
+obj-$(CONFIG_S3C64XX_COMMON_CLK)       += clk-s3c64xx.o
+obj-$(CONFIG_S5PV210_COMMON_CLK)       += clk-s5pv210.o clk-s5pv210-audss.o