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

[pandora-kernel.git] / arch / ppc / Kconfig

diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index c22e606..ccce2a4 100644 (file)
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -845,6 +845,21 @@ config MV64X60
        select PPC_INDIRECT_PCI
        default y
 
+config MV643XX_ETH_0
+       bool
+       depends on MV643XX_ETH && (KATANA || RADSTONE_PPC7D || EV64360 || HDPU)
+       default y
+
+config MV643XX_ETH_1
+       bool
+       depends on MV643XX_ETH && (KATANA || RADSTONE_PPC7D || EV64360)
+       default y
+
+config MV643XX_ETH_2
+       bool
+       depends on MV643XX_ETH && (KATANA || RADSTONE_PPC7D || EV64360)
+       default y
+
 menu "Set bridge options"
        depends on MV64X60
 
@@ -1177,6 +1192,10 @@ config ISA
          have an IBM RS/6000 or pSeries machine or a PReP machine, say Y.  If
          you have an embedded board, consult your board documentation.
 
+config ZONE_DMA
+       bool
+       default y
+
 config GENERIC_ISA_DMA
        bool
        depends on 6xx && !CPM2