Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[pandora-kernel.git] / arch / arm / plat-omap / Kconfig

diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index efe85d0..64b3f52 100644 (file)
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -120,6 +120,10 @@ config OMAP_MBOX_FWK
 config OMAP_IOMMU
        tristate
 
+config OMAP_IOMMU_DEBUG
+       depends on OMAP_IOMMU
+       tristate
+
 choice
         prompt "System timer"
        default OMAP_MPU_TIMER
@@ -183,6 +187,19 @@ config OMAP_SERIAL_WAKE
          to data on the serial RX line. This allows you to wake the
          system from serial console.
 
+choice
+       prompt "OMAP PM layer selection"
+       depends on ARCH_OMAP
+       default OMAP_PM_NOOP
+
+config OMAP_PM_NONE
+       bool "No PM layer"
+
+config OMAP_PM_NOOP
+       bool "No-op/debug PM layer"
+
+endchoice
+
 endmenu
 
 endif