From: Arnd Bergmann Date: Fri, 11 May 2012 15:15:31 +0000 (+0200) Subject: Merge branch 'clk/mxs' of git://git.linaro.org/people/shawnguo/linux-2.6 into next... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=93c6d8927fa692faef3d7d945bd4fe84b0185ad4;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge branch 'clk/mxs' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/clock Shawn Guo writes: mxs common clk porting for v3.5. It depends on the following two branches. [1] git://git.linaro.org/people/mturquette/linux.git clk-next [2] http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git clkdev As the mxs device tree conversion will constantly touch clock files, to save the conflicts, the updated mxs/dt branch coming later will based on this pull-request. * 'clk/mxs' of git://git.linaro.org/people/shawnguo/linux-2.6: ARM: mxs: remove now unused timer_clk argument from mxs_timer_init ARM: mxs: remove old clock support ARM: mxs: switch to common clk framework ARM: mxs: change the lookup name for fec phy clock ARM: mxs: request clock for timer clk: mxs: add clock support for imx28 clk: mxs: add clock support for imx23 clk: mxs: add mxs specific clocks Includes an update to Linux 3.4-rc6 Conflicts: drivers/clk/Makefile Signed-off-by: Arnd Bergmann --- 93c6d8927fa692faef3d7d945bd4fe84b0185ad4 diff --cc drivers/clk/Makefile index 24aa7144811b,a576f5447d38..4a5bdbc30389 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@@ -1,4 -1,6 +1,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-mux.o clk-divider.o clk-fixed-factor.o + + obj-$(CONFIG_ARCH_MXS) += mxs/