diff options
| author | Kukjin Kim | 2014-05-25 22:20:25 +0200 |
|---|---|---|
| committer | Kukjin Kim | 2014-05-25 22:20:25 +0200 |
| commit | 985326c9f65a4c1a3b5ab875e6ce0c97c39449ec (patch) | |
| tree | ad32fb4216bea6dd39d0f05d246f354e1dc00bcc /drivers/clk/Makefile | |
| parent | ARM: EXYNOS: Add MCPM call-back functions (diff) | |
| parent | clk: exynos5420: Add 5800 specific clocks (diff) | |
| download | kernel-qcow2-linux-985326c9f65a4c1a3b5ab875e6ce0c97c39449ec.tar.gz kernel-qcow2-linux-985326c9f65a4c1a3b5ab875e6ce0c97c39449ec.tar.xz kernel-qcow2-linux-985326c9f65a4c1a3b5ab875e6ce0c97c39449ec.zip | |
Merge branch 'v3.16-next/clk-samsung' into v3.16-next/cpuidle-exynos
Diffstat (limited to 'drivers/clk/Makefile')
| -rw-r--r-- | drivers/clk/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile index 5f8a28735c96..17d7f13d19a5 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@ -41,7 +41,7 @@ obj-$(CONFIG_PLAT_ORION) += mvebu/ obj-$(CONFIG_ARCH_MXS) += mxs/ obj-$(CONFIG_COMMON_CLK_QCOM) += qcom/ obj-$(CONFIG_ARCH_ROCKCHIP) += rockchip/ -obj-$(CONFIG_PLAT_SAMSUNG) += samsung/ +obj-$(CONFIG_COMMON_CLK_SAMSUNG) += samsung/ obj-$(CONFIG_ARCH_SHMOBILE_MULTI) += shmobile/ obj-$(CONFIG_ARCH_SIRF) += sirf/ obj-$(CONFIG_ARCH_SOCFPGA) += socfpga/ |