diff options
author | Hiroshi DOYU <Hiroshi.DOYU@nokia.com> | 2009-01-28 14:32:08 -0500 |
---|---|---|
committer | Hiroshi DOYU <Hiroshi.DOYU@nokia.com> | 2009-05-22 03:16:36 -0400 |
commit | e769421de22422461f0becae0ec6e792ec6f4476 (patch) | |
tree | 095434c804dbe45d1a4c31d2b4b0408560bcfd41 /arch | |
parent | 69d3a84a646d6ad6cd693a7a3d5b9af414113d2c (diff) |
omap iommu: entries for Kconfig and Makefile
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/plat-omap/Kconfig | 3 | ||||
-rw-r--r-- | arch/arm/plat-omap/Makefile | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig index 9dd68fafb374..d483b2592ec8 100644 --- a/arch/arm/plat-omap/Kconfig +++ b/arch/arm/plat-omap/Kconfig | |||
@@ -115,6 +115,9 @@ config OMAP_MBOX_FWK | |||
115 | Say Y here if you want to use OMAP Mailbox framework support for | 115 | Say Y here if you want to use OMAP Mailbox framework support for |
116 | DSP, IVA1.0 and IVA2 in OMAP1/2/3. | 116 | DSP, IVA1.0 and IVA2 in OMAP1/2/3. |
117 | 117 | ||
118 | config OMAP_IOMMU | ||
119 | tristate | ||
120 | |||
118 | choice | 121 | choice |
119 | prompt "System timer" | 122 | prompt "System timer" |
120 | default OMAP_MPU_TIMER | 123 | default OMAP_MPU_TIMER |
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- := | |||
13 | obj-$(CONFIG_ARCH_OMAP16XX) += ocpi.o | 13 | obj-$(CONFIG_ARCH_OMAP16XX) += ocpi.o |
14 | 14 | ||
15 | obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o | 15 | obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o |
16 | obj-$(CONFIG_OMAP_IOMMU) += iommu.o iovmm.o | ||
16 | 17 | ||
17 | obj-$(CONFIG_CPU_FREQ) += cpu-omap.o | 18 | obj-$(CONFIG_CPU_FREQ) += cpu-omap.o |
18 | obj-$(CONFIG_OMAP_DM_TIMER) += dmtimer.o | 19 | obj-$(CONFIG_OMAP_DM_TIMER) += dmtimer.o |