This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / ppc / Kconfig

diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index b460f00..f4621dd 100644 (file)
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -11,10 +11,6 @@ config MMU
 config UID16
        bool
 
-config GENERIC_HARDIRQS
-       bool
-       default y
-
 config RWSEM_GENERIC_SPINLOCK
        bool
 
@@ -74,7 +70,6 @@ config POWER4
        bool "POWER4 and 970 (G5)"
 
 config 8xx
-       depends on BROKEN
        bool "8xx"
 
 config E500
@@ -189,25 +184,17 @@ config MATH_EMULATION
          here.  Saying Y here will not hurt performance (on any machine) but
          will increase the size of the kernel.
 
-config KEXEC
-       bool "kexec system call (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
+config CPU_FREQ
+       bool "CPU Frequency scaling"
        help
-         kexec is a system call that implements the ability to shutdown your
-         current kernel, and to start another kernel.  It is like a reboot
-         but it is indepedent of the system firmware.   And like a reboot
-         you can start any kernel with it, not just Linux.
+         Clock scaling allows you to change the clock speed of CPUs on the
+         fly. This is a nice method to save battery power on notebooks,
+         because the lower the clock speed, the less power the CPU consumes.
 
-         The name comes from the similiarity to the exec system call.
+         For more information, take a look at <file:Documentation/cpu-freq> or
+         at <http://www.brodo.de/cpufreq/>
 
-         It is an ongoing process to be certain the hardware in a machine
-         is properly shutdown, so do not be surprised if this code does not
-         initially work for you.  It may help to enable device hotplugging
-         support.  As of this writing the exact hardware interface is
-         strongly in flux, so no good recommendation can be made.
-
-         In the GameCube implementation, kexec allows you to load and
-         run DOL files, including kernel and homebrew DOLs.
+         If in doubt, say N.
 
 source "drivers/cpufreq/Kconfig"
 
@@ -256,6 +243,26 @@ config NOT_COHERENT_CACHE
        depends on 4xx || 8xx
        default y
 
+config KEXEC
+       bool "kexec system call (EXPERIMENTAL)"
+       depends on EXPERIMENTAL
+       help
+         kexec is a system call that implements the ability to shutdown your
+         current kernel, and to start another kernel.  It is like a reboot
+         but it is indepedent of the system firmware.   And like a reboot
+         you can start any kernel with it, not just Linux.
+
+         The name comes from the similiarity to the exec system call.
+
+         It is an ongoing process to be certain the hardware in a machine
+         is properly shutdown, so do not be surprised if this code does not
+         initially work for you.  It may help to enable device hotplugging
+         support.  As of this writing the exact hardware interface is
+         strongly in flux, so no good recommendation can be made.
+
+         In the GameCube implementation, kexec allows you to load and
+         run DOL files, including kernel and homebrew DOLs.
+
 endmenu
 
 menu "Platform options"
@@ -765,6 +772,16 @@ config PC_KEYBOARD
        bool "PC PS/2 style Keyboard"
        depends on 4xx || CPM2
 
+config SERIAL_CONSOLE
+       bool
+       depends on 8xx
+       default y
+
+config SERIAL_CONSOLE_BAUD
+       int
+       depends on EV64260
+       default "115200"
+
 config PPCBUG_NVRAM
        bool "Enable reading PPCBUG NVRAM during boot" if PPLUS || LOPEC
        default y if PPC_PREP