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

Conflicts:
	arch/arm/mach-omap2/cclock3xxx_data.c

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/clk/ti/Makefile b/drivers/clk/ti/Makefile
index 36acc7d0d91c..14e6686a5eea 100644
--- a/drivers/clk/ti/Makefile
+++ b/drivers/clk/ti/Makefile
@@ -5,7 +5,8 @@ clk-common				= dpll.o composite.o divider.o gate.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 \