[MIPS] Sibyte: Fix name of clocksource.

[~andy/linux] / arch / ppc / Kconfig

diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index c1b34eb383cf165a385ba5bc21f0ddaee589c04f..6473fa7cb4b95c43326def7b2dbe3a5d94e46d06 100644 (file)
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -4,6 +4,10 @@
 
 mainmenu "Linux/PowerPC Kernel Configuration"
 
+config WORD_SIZE
+       int
+       default 32
+
 config MMU
        bool
        default y
@@ -98,6 +102,7 @@ config 44x
 
 config 8xx
        bool "8xx"
+       select PPC_LIB_RHEAP
 
 config E200
        bool "e200"
@@ -794,6 +799,7 @@ config CPM1
 config CPM2
        bool
        depends on 8260 || MPC8560 || MPC8555
+       select PPC_LIB_RHEAP
        default y
        help
          The CPM2 (Communications Processor Module) is a coprocessor on
@@ -1012,7 +1018,7 @@ config CMDLINE
          some command-line options at build time by entering them here.  In
          most cases you will need to specify the root device here.
 
-if !44x || BROKEN
+if BROKEN
 source kernel/power/Kconfig
 endif
 
@@ -1273,6 +1279,10 @@ config BOOT_LOAD
 config PIN_TLB
        bool "Pinned Kernel TLBs (860 ONLY)"
        depends on ADVANCED_OPTIONS && 8xx
+
+config PPC_LIB_RHEAP
+       bool
+
 endmenu
 
 source "net/Kconfig"
@@ -1307,7 +1317,7 @@ endmenu
 
 source "lib/Kconfig"
 
-source "arch/powerpc/oprofile/Kconfig"
+source "kernel/Kconfig.instrumentation"
 
 source "arch/ppc/Kconfig.debug"