Merge branches 'omap1-upstream' and 'omap2-upstream' into devel

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / pasemi / Kconfig

diff --git a/arch/powerpc/platforms/pasemi/Kconfig b/arch/powerpc/platforms/pasemi/Kconfig
index eb4dbc705b0654b771f4de03548084499185d854..735e1536cbfc15dc93a01d517d55245190694ab6 100644 (file)
--- a/arch/powerpc/platforms/pasemi/Kconfig
+++ b/arch/powerpc/platforms/pasemi/Kconfig
@@ -4,8 +4,8 @@ config PPC_PASEMI
        default n
        select MPIC
        select PPC_UDBG_16550
-       select GENERIC_TBSYNC
        select PPC_NATIVE
+       select MPIC_BROKEN_REGREAD
        help
          This option enables support for PA Semi's PWRficient line
          of SoC processors, including PA6T-1682M
@@ -19,6 +19,16 @@ config PPC_PASEMI_IOMMU
        help
          IOMMU support for PA6T-1682M
 
+config PPC_PASEMI_IOMMU_DMA_FORCE
+       bool "Force DMA engine to use IOMMU"
+       depends on PPC_PASEMI_IOMMU
+       help
+         This option forces the use of the IOMMU also for the
+         DMA engine. Otherwise the kernel will use it only when
+         running under a hypervisor.
+
+         If in doubt, say "N".
+
 config PPC_PASEMI_MDIO
        depends on PHYLIB
        tristate "MDIO support via GPIO"
@@ -26,4 +36,13 @@ config PPC_PASEMI_MDIO
        help
          Driver for MDIO via GPIO on PWRficient platforms
 
+config ELECTRA_IDE
+      tristate "Electra IDE driver"
+      default y
+      depends on PPC_PASEMI && ATA
+      select PATA_PLATFORM
+      help
+       This includes driver support for the Electra on-board IDE
+       interface.
+
 endmenu