diff options
| author | Tony Lindgren <tony@atomide.com> | 2014-07-23 01:21:33 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2014-07-23 01:21:33 -0700 |
| commit | ecf4c7938fe10aabdb962187719911d345bc20b1 (patch) | |
| tree | 9e75230becb4a8a095f65274ab0fd5659aa497a8 /arch/arm/mach-omap2/Makefile | |
| parent | 2aa7f52b532f9dc2c216c2892bc77b2fc2c89bb7 (diff) | |
| parent | c913c8a15a02e91c1f0302d68bebf66838a9689d (diff) | |
Merge tag 'for-v3.17/omap-hwmod-a' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.17/soc
OMAP hwmod data additions for v3.17. Most of these are DRA7xx-related,
although one patch adds DSS hwmods for AM43xx.
Basic build, boot, and PM test results are available here:
http://www.pwsan.com/omap/testlogs/hwmod-a-v3.17/20140722143514/
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 8ca99e9321e3..863ec46e84a7 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -202,6 +202,7 @@ obj-$(CONFIG_SOC_OMAP2420) += opp2420_data.o obj-$(CONFIG_SOC_OMAP2430) += opp2430_data.o # hwmod data +obj-y += omap_hwmod_common_ipblock_data.o obj-$(CONFIG_SOC_OMAP2420) += omap_hwmod_2xxx_ipblock_data.o obj-$(CONFIG_SOC_OMAP2420) += omap_hwmod_2xxx_3xxx_ipblock_data.o obj-$(CONFIG_SOC_OMAP2420) += omap_hwmod_2xxx_interconnect_data.o |