Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc-merge

1 files changed, 25 insertions, 4 deletions

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 967ecf92d6a7..f4e25c648fbb 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -300,6 +300,7 @@ config PPC_PMAC64
         bool
         depends on PPC_PMAC && POWER4
         select U3_DART
+        select GENERIC_TBSYNC
         default y
 
 config PPC_PREP
@@ -314,15 +315,17 @@ config PPC_MAPLE
         bool "  Maple 970FX Evaluation Board"
         select U3_DART
         select MPIC_BROKEN_U3
+        select GENERIC_TBSYNC
         default n
         help
           This option enables support for the Maple 970FX Evaluation Board.
           For more informations, refer to <http://www.970eval.com>
 
-config PPC_BPA
-        bool "  Broadband Processor Architecture"
+config PPC_CELL
+        bool "  Cell Broadband Processor Architecture"
         depends on PPC_MULTIPLATFORM && PPC64
         select PPC_RTAS
+        select MMIO_NVRAM
 
 config PPC_OF
         bool
@@ -353,13 +356,26 @@ config RTAS_ERROR_LOGGING
         depends on PPC_RTAS
         default n
 
+config RTAS_PROC
+        bool "Proc interface to RTAS"
+        depends on PPC_RTAS
+        default y
+
+config RTAS_FLASH
+        tristate "Firmware flash interface"
+        depends on PPC64 && RTAS_PROC
+
+config MMIO_NVRAM
+        bool
+        default n
+
 config MPIC_BROKEN_U3
         bool
         depends on PPC_MAPLE
         default y
 
-config BPA_IIC
-        depends on PPC_BPA
+config CELL_IIC
+        depends on PPC_CELL
         bool
         default y
 
@@ -372,6 +388,11 @@ config PPC_MPC106
         bool
         default n
 
+config GENERIC_TBSYNC
+        bool
+        default y if CONFIG_PPC32 && CONFIG_SMP
+        default n
+
 source "drivers/cpufreq/Kconfig"
 
 config CPU_FREQ_PMAC