diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-01 18:02:27 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-01 18:02:27 -0400 |
commit | ceeec3dc375e3b0618f16b34efc56fe093918f8b (patch) | |
tree | 2293d02721ee05131aaf1c60e4fba7e281585eec /arch/ppc64/configs/pSeries_defconfig | |
parent | fbff868db3a4cc6a89d51da9a6d49b26c29d04fb (diff) | |
parent | e3ee3b78f83688a0ae4315e8be71b2eac559904a (diff) |
/spare/repo/netdev-2.6 branch 'ieee80211'
Diffstat (limited to 'arch/ppc64/configs/pSeries_defconfig')
-rw-r--r-- | arch/ppc64/configs/pSeries_defconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/ppc64/configs/pSeries_defconfig b/arch/ppc64/configs/pSeries_defconfig index 297fd522948..29f7b80b0ef 100644 --- a/arch/ppc64/configs/pSeries_defconfig +++ b/arch/ppc64/configs/pSeries_defconfig | |||
@@ -112,10 +112,10 @@ CONFIG_PREEMPT_NONE=y | |||
112 | # CONFIG_PREEMPT_VOLUNTARY is not set | 112 | # CONFIG_PREEMPT_VOLUNTARY is not set |
113 | # CONFIG_PREEMPT is not set | 113 | # CONFIG_PREEMPT is not set |
114 | # CONFIG_PREEMPT_BKL is not set | 114 | # CONFIG_PREEMPT_BKL is not set |
115 | CONFIG_HZ_100=y | 115 | # CONFIG_HZ_100 is not set |
116 | # CONFIG_HZ_250 is not set | 116 | CONFIG_HZ_250=y |
117 | # CONFIG_HZ_1000 is not set | 117 | # CONFIG_HZ_1000 is not set |
118 | CONFIG_HZ=100 | 118 | CONFIG_HZ=250 |
119 | CONFIG_EEH=y | 119 | CONFIG_EEH=y |
120 | CONFIG_GENERIC_HARDIRQS=y | 120 | CONFIG_GENERIC_HARDIRQS=y |
121 | CONFIG_PPC_RTAS=y | 121 | CONFIG_PPC_RTAS=y |