diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-25 05:15:59 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-25 05:20:21 -0400 |
| commit | 56a459314a982bae75b9bce64bcca853d378ca7e (patch) | |
| tree | 07d9121fb08229ebe2ac2f4420cec70434c7bbba /arch/arm/plat-omap/Kconfig | |
| parent | fc05505b77f7900a1bb74fb3f3a4343dee4265a4 (diff) | |
| parent | 5c651ffaee6f07aa1f5e6d0763845a2ee606b6bd (diff) | |
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/Kconfig')
| -rw-r--r-- | arch/arm/plat-omap/Kconfig | 3 |
1 files changed, 3 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 |