diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-02-11 21:40:45 +0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-02-11 21:40:45 +0400 |
| commit | 93b23711b7132400d4d76f31c660d27a2bb0afdb (patch) | |
| tree | 9de75a8020d78fc210f82451414bc0a09f6fa228 /arch/arm/mach-omap2/Makefile | |
| parent | 88b62b915b0b7e25870eb0604ed9a92ba4bfc9f7 (diff) | |
| parent | a5a8c31d9f7587b601ecf0106c8abeabe3da24c3 (diff) | |
| download | linux-93b23711b7132400d4d76f31c660d27a2bb0afdb.tar.xz | |
Merge tag 'omap-devel-d2-for-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.9/pm-omap4
Some OMAP4 power management fixes and audio device integration
patches. This pull request contains a fix for an issue discovered during
branch integration.
Basic test logs are available at:
http://www.pwsan.com/omap/testlogs/omap4_prcm_devel_a_3.9/20130210112717/
Diffstat (limited to 'arch/arm/mach-omap2/Makefile')
| -rw-r--r-- | arch/arm/mach-omap2/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 947cafe65aef..d88788facf52 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -8,7 +8,7 @@ obj-y := id.o io.o control.o mux.o devices.o fb.o serial.o gpmc.o timer.o pm.o \ omap_device.o sram.o omap-2-3-common = irq.o -hwmod-common = omap_hwmod.o \ +hwmod-common = omap_hwmod.o omap_hwmod_reset.o \ omap_hwmod_common_data.o clock-common = clock.o clock_common_data.o \ clkt_dpll.o clkt_clksel.o |