Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe767560 authored by Michael Turquette's avatar Michael Turquette
Browse files

Merge branch 'clk-omap-legacy' into clk-next 

Conflicts:
	arch/arm/mach-omap2/cclock3xxx_data.c
parents 035a61c3 d6540b19

arch/arm/mach-omap2/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ obj-$(CONFIG_SOC_OMAP2430) += clock2430.o 
obj-$(CONFIG_ARCH_OMAP3)		+= $(clock-common) clock3xxx.o

obj-$(CONFIG_ARCH_OMAP3)		+= clock34xx.o clkt34xx_dpll3m2.o

obj-$(CONFIG_ARCH_OMAP3)		+= clock3517.o clock36xx.o

obj-$(CONFIG_ARCH_OMAP3)		+= dpll3xxx.o cclock3xxx_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= dpll3xxx.o

obj-$(CONFIG_ARCH_OMAP3)		+= clkt_iclk.o

obj-$(CONFIG_ARCH_OMAP4)		+= $(clock-common)

obj-$(CONFIG_ARCH_OMAP4)		+= dpll3xxx.o dpll44xx.o