Merge branch 'hwmod_2.6.37' of git://git.pwsan.com/linux-2.6 into omap-for-linus (9af2ebbd) · Commits · e / devices / android_kernel_teracube_emerald

arch/arm/mach-omap2/Makefile

+2 −2

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@
		# Common support
		obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer-gp.o pm.o

		omap-2-3-common = irq.o sdrc.o
		omap-2-3-common = irq.o sdrc.o prm2xxx_3xxx.o
		hwmod-common = omap_hwmod.o \
		omap_hwmod_common_data.o
		prcm-common = prcm.o powerdomain.o
		@@ -15,7 +15,7 @@ clock-common = clock.o clock_common_data.o \

		obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(prcm-common) $(hwmod-common)
		obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(prcm-common) $(hwmod-common)
		obj-$(CONFIG_ARCH_OMAP4) += $(prcm-common) $(hwmod-common)
		obj-$(CONFIG_ARCH_OMAP4) += $(prcm-common) prm44xx.o $(hwmod-common)

		obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o