From: Michael Turquette Date: Fri, 30 Jan 2015 18:57:21 +0000 (-0800) Subject: Merge branch 'clk-omap-legacy' into clk-next X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fe767560523d7556cb11fef466adf4b10141d73b;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'clk-omap-legacy' into clk-next Conflicts: arch/arm/mach-omap2/cclock3xxx_data.c --- fe767560523d7556cb11fef466adf4b10141d73b diff --cc drivers/clk/ti/Makefile index 36acc7d0d91c,d8a770ae508d..14e6686a5eea --- a/drivers/clk/ti/Makefile +++ b/drivers/clk/ti/Makefile @@@ -3,9 -3,9 +3,10 @@@ obj-y += clk.o autoidle.o clockdoma clk-common = dpll.o composite.o divider.o gate.o \ fixed-factor.o mux.o apll.o obj-$(CONFIG_SOC_AM33XX) += $(clk-common) clk-33xx.o +obj-$(CONFIG_SOC_TI81XX) += $(clk-common) fapll.o clk-816x.o obj-$(CONFIG_ARCH_OMAP2) += $(clk-common) interface.o clk-2xxx.o - obj-$(CONFIG_ARCH_OMAP3) += $(clk-common) interface.o clk-3xxx.o + obj-$(CONFIG_ARCH_OMAP3) += $(clk-common) interface.o \ + clk-3xxx.o clk-3xxx-legacy.o obj-$(CONFIG_ARCH_OMAP4) += $(clk-common) clk-44xx.o obj-$(CONFIG_SOC_OMAP5) += $(clk-common) clk-54xx.o obj-$(CONFIG_SOC_DRA7XX) += $(clk-common) clk-7xx.o \