aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap
diff options
context:
space:
mode:
authorFlorian Vaussard <florian.vaussard@epfl.ch>2014-03-05 19:24:10 -0500
committerTony Lindgren <tony@atomide.com>2014-03-12 12:48:00 -0400
commit895a9613a1ee693c6b5017330c8093621f021107 (patch)
tree06e8a065ac3828cd9fe97c93a12d9a48ac61e17c /arch/arm/plat-omap
parent18c49af3ee9e32a535413a949672bea726699f04 (diff)
ARM: OMAP3: remove deprecated CONFIG_OMAP_IOMMU_IVA2
CONFIG_OMAP_IOMMU_IVA2 was defined originally to avoid conflicting usage by tidspbridge and other iommu users. The same can be achieved by marking the DT node disabled, so remove this obsolete flag and the corresponding hwmod data can be enabled. Cc: Paul Walmsley <paul@pwsan.com> Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch> [s-anna@ti.com: revise commit log] Signed-off-by: Suman Anna <s-anna@ti.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Tony Lindgren <tony@atomide.com> Acked-by: Paul Walmsley <paul@pwsan.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/plat-omap')
-rw-r--r--arch/arm/plat-omap/Kconfig3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index 436ea97074cd..02fc10d2d63b 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -86,9 +86,6 @@ config OMAP_MUX_WARNINGS
86 to change the pin multiplexing setup. When there are no warnings 86 to change the pin multiplexing setup. When there are no warnings
87 printed, it's safe to deselect OMAP_MUX for your product. 87 printed, it's safe to deselect OMAP_MUX for your product.
88 88
89config OMAP_IOMMU_IVA2
90 bool
91
92config OMAP_MPU_TIMER 89config OMAP_MPU_TIMER
93 bool "Use mpu timer" 90 bool "Use mpu timer"
94 depends on ARCH_OMAP1 91 depends on ARCH_OMAP1