diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-03-20 08:18:27 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-03-20 08:18:27 +0200 |
| commit | 703cc5df19d5dfaeaab8695eba8ca436ca3a8b6f (patch) | |
| tree | cc07d39b543151c824e68c3e8ebf323f4214cc64 /arch/arm/plat-omap/Kconfig | |
| parent | 17d5ca91cfc59ae91da5ff9da74ab09a9a2a17d9 (diff) | |
| parent | 1133420fe1a05789b1566f3e49f9d2e66703b93f (diff) | |
| download | lwn-703cc5df19d5dfaeaab8695eba8ca436ca3a8b6f.tar.gz lwn-703cc5df19d5dfaeaab8695eba8ca436ca3a8b6f.zip | |
Merge branch '3.15/dss-dt-dts' into 3.15/fbdev
OMAP DSS related .dts changes
Diffstat (limited to 'arch/arm/plat-omap/Kconfig')
| -rw-r--r-- | arch/arm/plat-omap/Kconfig | 3 |
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 to change the pin multiplexing setup. When there are no warnings printed, it's safe to deselect OMAP_MUX for your product. -config OMAP_IOMMU_IVA2 - bool - config OMAP_MPU_TIMER bool "Use mpu timer" depends on ARCH_OMAP1 |