diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-25 10:15:59 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-25 10:20:21 +0100 |
| commit | 56a459314a982bae75b9bce64bcca853d378ca7e (patch) | |
| tree | 07d9121fb08229ebe2ac2f4420cec70434c7bbba /arch/arm/plat-omap/Makefile | |
| parent | fc05505b77f7900a1bb74fb3f3a4343dee4265a4 (diff) | |
| parent | 5c651ffaee6f07aa1f5e6d0763845a2ee606b6bd (diff) | |
| download | talos-op-linux-56a459314a982bae75b9bce64bcca853d378ca7e.tar.gz talos-op-linux-56a459314a982bae75b9bce64bcca853d378ca7e.zip | |
Merge branch 'iommu' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git into devel
Diffstat (limited to 'arch/arm/plat-omap/Makefile')
| -rw-r--r-- | arch/arm/plat-omap/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile index 04a100cfb8e5..a83279523958 100644 --- a/arch/arm/plat-omap/Makefile +++ b/arch/arm/plat-omap/Makefile @@ -13,6 +13,7 @@ obj- := obj-$(CONFIG_ARCH_OMAP16XX) += ocpi.o obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o +obj-$(CONFIG_OMAP_IOMMU) += iommu.o iovmm.o obj-$(CONFIG_CPU_FREQ) += cpu-omap.o obj-$(CONFIG_OMAP_DM_TIMER) += dmtimer.o |
