diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-30 13:32:29 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-30 13:32:29 -0400 |
| commit | ed735ccbefaf7e5e3ef61418f7e209b8c59308a7 (patch) | |
| tree | b8cc69814d2368b08d0a84c8da0c12028bd04867 /arch/ppc64/defconfig | |
| parent | 39fbe47377062200acc26ea0ccef223b4399a82c (diff) | |
| parent | d8971fcb702e24d1e22c77fd1772f182ffee87e3 (diff) | |
Merge HEAD from /spare/repo/linux-2.6/.git
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 |