summaryrefslogtreecommitdiffstats
path: root/drivers/clk/Makefile
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-05-13 00:11:06 +0200
committerArnd Bergmann <arnd@arndb.de>2012-05-13 00:11:06 +0200
commiteae0185a9677d3ff0c1781ee196f2ef42deb0ea1 (patch)
tree15ed6ba564cd04b4ac7235f85ea7489d4eeaaa9b /drivers/clk/Makefile
parent93c6d8927fa692faef3d7d945bd4fe84b0185ad4 (diff)
parent5df33a62c4a028d6fc7f2dcc159827d09b7334b8 (diff)
downloadlinux-eae0185a9677d3ff0c1781ee196f2ef42deb0ea1.tar.bz2
Merge branch 'spear/clock' into next/clock
Viresh Kumar <viresh.kumar@st.com> writes: This is rebased over a (merge of Mike's/clk-next & SPEAr's DT) + Russell's patch: CLKDEV: provide helpers for common clock framework rebased over them. * spear/clock: SPEAr: Switch to common clock framework SPEAr: Call clk_prepare() before calling clk_enable SPEAr: clk: Add General Purpose Timer Synthesizer clock SPEAr: clk: Add Fractional Synthesizer clock SPEAr: clk: Add Auxiliary Synthesizer clock SPEAr: clk: Add VCO-PLL Synthesizer clock Conflicts: drivers/clk/Makefile [Arnd: rebased again without the spear/dt branch] Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/clk/Makefile')
-rw-r--r--drivers/clk/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
index 4a5bdbc30389..b9a5158a30b1 100644
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@ -2,5 +2,6 @@
obj-$(CONFIG_CLKDEV_LOOKUP) += clkdev.o
obj-$(CONFIG_COMMON_CLK) += clk.o clk-fixed-rate.o clk-gate.o \
clk-mux.o clk-divider.o clk-fixed-factor.o
-
+# SoCs specific
obj-$(CONFIG_ARCH_MXS) += mxs/
+obj-$(CONFIG_PLAT_SPEAR) += spear/