diff options
| author | Paul Walmsley <paul@pwsan.com> | 2012-09-23 19:16:04 -0400 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2012-09-23 19:16:04 -0400 |
| commit | 1e2ee2a60df5c3ab74dd1c9155fb01b5bc6f807d (patch) | |
| tree | 2adb98096c4a6dec0ceff4e7e04610a079f14026 /arch/arm/mach-omap2/Makefile | |
| parent | 291852e8791a596195edc3ced96481bfd105f35b (diff) | |
| parent | 11964f53eb4d9ce59a058be9999d9cfcb1ced878 (diff) | |
Merge tag 'omap-devel-am33xx-for-v3.7' into test_v3.6-rc6_ocb3.7_cff3.7_odaf3.7
From Paul Walmsley <paul@pwsan.com>:
AM33xx hwmod data and miscellaneous clock and hwmod fixes. AM33xx
should now boot on mainline after this is applied, according to
Vaibhav.
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 34c2c7f59f0a..f629df13f157 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile | |||
| @@ -194,6 +194,7 @@ obj-$(CONFIG_SOC_OMAP2430) += omap_hwmod_2430_data.o | |||
| 194 | obj-$(CONFIG_ARCH_OMAP3) += omap_hwmod_2xxx_3xxx_ipblock_data.o | 194 | obj-$(CONFIG_ARCH_OMAP3) += omap_hwmod_2xxx_3xxx_ipblock_data.o |
| 195 | obj-$(CONFIG_ARCH_OMAP3) += omap_hwmod_2xxx_3xxx_interconnect_data.o | 195 | obj-$(CONFIG_ARCH_OMAP3) += omap_hwmod_2xxx_3xxx_interconnect_data.o |
| 196 | obj-$(CONFIG_ARCH_OMAP3) += omap_hwmod_3xxx_data.o | 196 | obj-$(CONFIG_ARCH_OMAP3) += omap_hwmod_3xxx_data.o |
| 197 | obj-$(CONFIG_SOC_AM33XX) += omap_hwmod_33xx_data.o | ||
| 197 | obj-$(CONFIG_ARCH_OMAP4) += omap_hwmod_44xx_data.o | 198 | obj-$(CONFIG_ARCH_OMAP4) += omap_hwmod_44xx_data.o |
| 198 | 199 | ||
| 199 | # EMU peripherals | 200 | # EMU peripherals |