git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2239_FC5 patched with stable patch-2.6.18.2-vs2.0...
[linux-2.6.git]
/
configs
/
kernel-2.6.18-ppc64iseries.config
diff --git
a/configs/kernel-2.6.18-ppc64iseries.config
b/configs/kernel-2.6.18-ppc64iseries.config
index
ffeabee
..
22f7514
100644
(file)
--- a/
configs/kernel-2.6.18-ppc64iseries.config
+++ b/
configs/kernel-2.6.18-ppc64iseries.config
@@
-1,8
+1,8
@@
# powerpc
#
# Automatically generated make config: don't edit
# powerpc
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.18.2
-rc1
-# Mon Nov 13 09:
44:42
2006
+# Linux kernel version: 2.6.18.2
+# Mon Nov 13 09:
32:00
2006
#
CONFIG_PPC64=y
CONFIG_64BIT=y
#
CONFIG_PPC64=y
CONFIG_64BIT=y
@@
-147,9
+147,9
@@
CONFIG_IBMVIO=y
# Kernel options
#
# CONFIG_HZ_100 is not set
# Kernel options
#
# CONFIG_HZ_100 is not set
-CONFIG_HZ_250=y
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ=
25
0
+# CONFIG_HZ_250 is not set
+CONFIG_HZ_1000=y
+CONFIG_HZ=
100
0
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
# CONFIG_PREEMPT is not set
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
# CONFIG_PREEMPT is not set