diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-05-13 00:11:06 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-13 00:11:06 +0200 |
| commit | eae0185a9677d3ff0c1781ee196f2ef42deb0ea1 (patch) | |
| tree | 15ed6ba564cd04b4ac7235f85ea7489d4eeaaa9b /drivers/clk/Makefile | |
| parent | Merge branch 'clk/mxs' of git://git.linaro.org/people/shawnguo/linux-2.6 into... (diff) | |
| parent | SPEAr: Switch to common clock framework (diff) | |
| download | linux-eae0185a9677d3ff0c1781ee196f2ef42deb0ea1.tar.xz linux-eae0185a9677d3ff0c1781ee196f2ef42deb0ea1.zip | |
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/Makefile | 3 |
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/ |