aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/Makefile
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-12-21 17:05:57 -0800
committerTony Lindgren <tony@atomide.com>2010-12-21 17:05:57 -0800
commitb9e7683bbca638967a56e5d7fd4035a947109621 (patch)
tree3d02725c6e6bb3d77e1c34a04d5179ea4ee2509e /arch/arm/mach-omap2/Makefile
parentbb3613aa34a81a5e2f1227ccdb801fde04a7da10 (diff)
parent53da4ce23809ca33405001b0ae117e60b7feced1 (diff)
Merge branch 'pm-opp' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/Makefile')
-rw-r--r--arch/arm/mach-omap2/Makefile7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index cdfb5faaec9..1b699d3c6cb 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -49,6 +49,13 @@ obj-$(CONFIG_ARCH_OMAP4) += mux44xx.o
obj-$(CONFIG_ARCH_OMAP2) += sdrc2xxx.o
# obj-$(CONFIG_ARCH_OMAP3) += sdrc3xxx.o
+# OPP table initialization
+ifeq ($(CONFIG_PM_OPP),y)
+obj-y += opp.o
+obj-$(CONFIG_ARCH_OMAP3) += opp3xxx_data.o
+obj-$(CONFIG_ARCH_OMAP4) += opp4xxx_data.o
+endif
+
# Power Management
ifeq ($(CONFIG_PM),y)
obj-$(CONFIG_ARCH_OMAP2) += pm24xx.o