diff options
author | Olof Johansson <olof@lixom.net> | 2012-10-01 14:19:17 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-10-01 14:19:17 -0700 |
commit | 6d55d5968a8622f3ea20ec40737aea1cfba6438c (patch) | |
tree | 72481307c22f9b6170591cece793ea24f97a9ddb /arch/arm/mach-omap2/Makefile | |
parent | f7b967bffefe69f1ad8b79e263237ec1feba7b9b (diff) | |
parent | b6e3b5c2fea9c76617e101cbbc54ed14961f9dee (diff) | |
download | op-kernel-dev-6d55d5968a8622f3ea20ec40737aea1cfba6438c.zip op-kernel-dev-6d55d5968a8622f3ea20ec40737aea1cfba6438c.tar.gz |
Merge branch 'next/soc' into HEAD
Conflicts:
arch/arm/mach-ux500/clock.c
arch/arm/mach-ux500/cpu.c
drivers/clocksource/Makefile
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 7706fdf..84520235 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -174,6 +174,7 @@ obj-$(CONFIG_SOC_OMAP2430) += omap_hwmod_2430_data.o obj-$(CONFIG_ARCH_OMAP3) += omap_hwmod_2xxx_3xxx_ipblock_data.o obj-$(CONFIG_ARCH_OMAP3) += omap_hwmod_2xxx_3xxx_interconnect_data.o obj-$(CONFIG_ARCH_OMAP3) += omap_hwmod_3xxx_data.o +obj-$(CONFIG_SOC_AM33XX) += omap_hwmod_33xx_data.o obj-$(CONFIG_ARCH_OMAP4) += omap_hwmod_44xx_data.o # EMU peripherals |