diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-01 18:02:01 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-01 18:02:01 -0400 |
commit | e3ee3b78f83688a0ae4315e8be71b2eac559904a (patch) | |
tree | deb03bcdd020262af450ed23382d7c921263f5cf /arch/ppc64/defconfig | |
parent | 91cb70c1769d9b72dd1efe40c31f01005820b09e (diff) | |
parent | 6b39374a27eb4be7e9d82145ae270ba02ea90dc8 (diff) |
/spare/repo/netdev-2.6 branch 'master'
Diffstat (limited to 'arch/ppc64/defconfig')
-rw-r--r-- | arch/ppc64/defconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/ppc64/defconfig b/arch/ppc64/defconfig index c361e7727b7a..7cb4750bb7a9 100644 --- a/arch/ppc64/defconfig +++ b/arch/ppc64/defconfig | |||
@@ -114,10 +114,10 @@ CONFIG_PREEMPT_NONE=y | |||
114 | # CONFIG_PREEMPT_VOLUNTARY is not set | 114 | # CONFIG_PREEMPT_VOLUNTARY is not set |
115 | # CONFIG_PREEMPT is not set | 115 | # CONFIG_PREEMPT is not set |
116 | # CONFIG_PREEMPT_BKL is not set | 116 | # CONFIG_PREEMPT_BKL is not set |
117 | CONFIG_HZ_100=y | 117 | # CONFIG_HZ_100 is not set |
118 | # CONFIG_HZ_250 is not set | 118 | CONFIG_HZ_250=y |
119 | # CONFIG_HZ_1000 is not set | 119 | # CONFIG_HZ_1000 is not set |
120 | CONFIG_HZ=100 | 120 | CONFIG_HZ=250 |
121 | CONFIG_EEH=y | 121 | CONFIG_EEH=y |
122 | CONFIG_GENERIC_HARDIRQS=y | 122 | CONFIG_GENERIC_HARDIRQS=y |
123 | CONFIG_PPC_RTAS=y | 123 | CONFIG_PPC_RTAS=y |