Update of /cvsroot/gc-linux/linux/arch/ppc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24768/arch/ppc
Modified Files:
Kconfig
Log Message:
Merge 2.6.10
Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/Kconfig,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- Kconfig 22 Oct 2004 20:06:10 -0000 1.21
+++ Kconfig 4 Jan 2005 21:39:00 -0000 1.22
@@ -11,6 +11,10 @@
config UID16
bool
+config GENERIC_HARDIRQS
+ bool
+ default y
+
config RWSEM_GENERIC_SPINLOCK
bool
@@ -70,6 +74,7 @@
bool "POWER4 and 970 (G5)"
config 8xx
+ depends on BROKEN
bool "8xx"
config E500
@@ -184,18 +189,6 @@
here. Saying Y here will not hurt performance (on any machine) but
will increase the size of the kernel.
-config CPU_FREQ
- bool "CPU Frequency scaling"
- help
- 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.
-
- For more information, take a look at <file:Documentation/cpu-freq> or
- at <http://www.brodo.de/cpufreq/>
-
- If in doubt, say N.
-
source "drivers/cpufreq/Kconfig"
config CPU_FREQ_PMAC
@@ -794,16 +787,6 @@
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
|
