Merge commit 'v2.6.33-rc5' into secretlab/test-devicetree

1 files changed, 38 insertions, 13 deletions

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 2a75c6ae2a8..50c9af43e01 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -56,6 +56,16 @@ config IRQ_PER_CPU
         bool
         default y
 
+config NR_IRQS
+        int "Number of virtual interrupt numbers"
+        range 32 512
+        default "512"
+        help
+          This defines the number of virtual interrupt numbers the kernel
+          can manage. Virtual interrupt numbers are what you see in
+          /proc/interrupts. If you configure your system to have too few,
+          drivers will fail to load or worse - handle with care.
+
 config STACKTRACE_SUPPORT
         bool
         default y
@@ -200,24 +210,14 @@ config DEFAULT_UIMAGE
 config REDBOOT
         bool
 
-config HIBERNATE_32
-        bool
-        depends on (PPC_PMAC && !SMP) || BROKEN
-        default y
-
-config HIBERNATE_64
-        bool
-        depends on BROKEN || (PPC_PMAC64 && EXPERIMENTAL)
-        default y
-
 config ARCH_HIBERNATION_POSSIBLE
         bool
-        depends on (PPC64 && HIBERNATE_64) || (PPC32 && HIBERNATE_32)
         default y
 
 config ARCH_SUSPEND_POSSIBLE
         def_bool y
-        depends on ADB_PMU || PPC_EFIKA || PPC_LITE5200 || PPC_83xx
+        depends on ADB_PMU || PPC_EFIKA || PPC_LITE5200 || PPC_83xx || \
+                   PPC_85xx || PPC_86xx
 
 config PPC_DCR_NATIVE
         bool
@@ -321,6 +321,10 @@ config HOTPLUG_CPU
 
           Say N if you are unsure.
 
+config ARCH_CPU_PROBE_RELEASE
+        def_bool y
+        depends on HOTPLUG_CPU
+
 config ARCH_ENABLE_MEMORY_HOTPLUG
         def_bool y
 
@@ -379,6 +383,19 @@ config IRQ_ALL_CPUS
           CPU.  Generally saying Y is safe, although some problems have been
           reported with SMP Power Macintoshes with this option enabled.
 
+config SPARSE_IRQ
+        bool "Support sparse irq numbering"
+        default y
+        help
+          This enables support for sparse irqs. This is useful for distro
+          kernels that want to define a high CONFIG_NR_CPUS value but still
+          want to have low kernel memory footprint on smaller machines.
+
+          ( Sparse IRQs can also be beneficial on NUMA boxes, as they spread
+            out the irq_desc[] array in a more NUMA-friendly way. )
+
+          If you don't know what to do here, say Y.
+
 config NUMA
         bool "NUMA support"
         depends on PPC64
@@ -653,6 +670,14 @@ config FSL_PCI
         select PPC_INDIRECT_PCI
         select PCI_QUIRKS
 
+config FSL_PMC
+        bool
+        default y
+        depends on SUSPEND && (PPC_85xx || PPC_86xx)
+        help
+          Freescale MPC85xx/MPC86xx power management controller support
+          (suspend/resume). For MPC83xx see platforms/83xx/suspend.c
+
 config 4xx_SOC
         bool
 
@@ -680,7 +705,7 @@ config PPC_PCI_CHOICE
 config PCI
         bool "PCI support" if PPC_PCI_CHOICE
         default y if !40x && !CPM2 && !8xx && !PPC_83xx \
-                && !PPC_85xx && !PPC_86xx
+                && !PPC_85xx && !PPC_86xx && !GAMECUBE_COMMON
         default PCI_PERMEDIA if !4xx && !CPM2 && !8xx
         default PCI_QSPAN if !4xx && !CPM2 && 8xx
         select ARCH_SUPPORTS_MSI