diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-09-23 20:29:28 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-09-23 20:29:28 -0400 |
| commit | 172c11351576cf5daa8f1b02a265bf84de8bbed1 (patch) | |
| tree | 5bd75dc35bfced691abdef92bde861ca246b4321 /arch/arm/mach-omap2/Makefile | |
| parent | 9af2ebbd09e01bd2711617dcafce5f608cace6ec (diff) | |
| parent | 0aed043517ad4135cb458a46e9e99e21cbb59c69 (diff) | |
Merge branch 'pm-next' 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/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index eb2504a300c2..826cb0980054 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile | |||
| @@ -87,6 +87,7 @@ obj-$(CONFIG_ARCH_OMAP2430) += opp2430_data.o | |||
| 87 | obj-$(CONFIG_ARCH_OMAP2420) += omap_hwmod_2420_data.o | 87 | obj-$(CONFIG_ARCH_OMAP2420) += omap_hwmod_2420_data.o |
| 88 | obj-$(CONFIG_ARCH_OMAP2430) += omap_hwmod_2430_data.o | 88 | obj-$(CONFIG_ARCH_OMAP2430) += omap_hwmod_2430_data.o |
| 89 | obj-$(CONFIG_ARCH_OMAP3) += omap_hwmod_3xxx_data.o | 89 | obj-$(CONFIG_ARCH_OMAP3) += omap_hwmod_3xxx_data.o |
| 90 | obj-$(CONFIG_ARCH_OMAP4) += omap_hwmod_44xx_data.o | ||
| 90 | 91 | ||
| 91 | # EMU peripherals | 92 | # EMU peripherals |
| 92 | obj-$(CONFIG_OMAP3_EMU) += emu.o | 93 | obj-$(CONFIG_OMAP3_EMU) += emu.o |