Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

[linux-2.6] / arch / ppc / Kconfig

diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index 813c6c9a6d99211f222b0288511e83cd21e06fec..6e6377a69d5bc58c16de9f12013b377b3af7d17e 100644 (file)
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -43,6 +43,10 @@ config GENERIC_NVRAM
        bool
        default y
 
+config SCHED_NO_NO_OMIT_FRAME_POINTER
+       bool
+       default y
+
 source "init/Kconfig"
 
 menu "Processor"
@@ -53,6 +57,7 @@ choice
 
 config 6xx
        bool "6xx/7xx/74xx/52xx/82xx/83xx"
+       select PPC_FPU
        help
          There are four types of PowerPC chips supported.  The more common
          types (601, 603, 604, 740, 750, 7400), the Motorola embedded
@@ -72,9 +77,11 @@ config 44x
        bool "44x"
 
 config POWER3
+       select PPC_FPU
        bool "POWER3"
 
 config POWER4
+       select PPC_FPU
        bool "POWER4 and 970 (G5)"
 
 config 8xx
@@ -86,6 +93,9 @@ config E500
 
 endchoice
 
+config PPC_FPU
+       bool
+
 config BOOKE
        bool
        depends on E500
@@ -98,13 +108,19 @@ config FSL_BOOKE
 
 config PTE_64BIT
        bool
-       depends on 44x
-       default y
+       depends on 44x || E500
+       default y if 44x
+       default y if E500 && PHYS_64BIT
 
 config PHYS_64BIT
-       bool
-       depends on 44x
-       default y
+       bool 'Large physical address support' if E500
+       depends on 44x || E500
+       default y if 44x
+       ---help---
+         This option enables kernel support for larger than 32-bit physical
+         addresses.  This features is not be available on all e500 cores.
+
+         If in doubt, say N here.
 
 config ALTIVEC
        bool "AltiVec Support"
@@ -1069,6 +1085,10 @@ source kernel/power/Kconfig
 
 endmenu
 
+config ISA_DMA_API
+       bool
+       default y
+
 menu "Bus options"
 
 config ISA
@@ -1123,12 +1143,12 @@ config PCI_QSPAN
 
 config PCI_8260
        bool
-       depends on PCI && 8260 && !8272
+       depends on PCI && 8260
        default y
 
 config 8260_PCI9
        bool "  Enable workaround for MPC826x erratum PCI 9"
-       depends on PCI_8260
+       depends on PCI_8260 && !ADS8272
        default y
 
 choice