diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-03 02:44:09 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-03 02:44:09 -0400 |
| commit | 129521dcc94f781890f8f668219ab79f0073ff9f (patch) | |
| tree | 9f70707c88da65577f38814fe37b24c4b4957d64 /arch/ppc64/configs/iSeries_defconfig | |
| parent | 824b558bbe2c298b165cdb54c33718994dda30bb (diff) | |
| parent | f505380ba7b98ec97bf25300c2a58aeae903530b (diff) | |
Merge linux-2.6 into linux-acpi-2.6 test
Diffstat (limited to 'arch/ppc64/configs/iSeries_defconfig')
| -rw-r--r-- | arch/ppc64/configs/iSeries_defconfig | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/ppc64/configs/iSeries_defconfig b/arch/ppc64/configs/iSeries_defconfig index 394ba18b58c7..013d4e0e4003 100644 --- a/arch/ppc64/configs/iSeries_defconfig +++ b/arch/ppc64/configs/iSeries_defconfig | |||
| @@ -94,12 +94,11 @@ CONFIG_PREEMPT_NONE=y | |||
| 94 | # CONFIG_PREEMPT_VOLUNTARY is not set | 94 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 95 | # CONFIG_PREEMPT is not set | 95 | # CONFIG_PREEMPT is not set |
| 96 | # CONFIG_PREEMPT_BKL is not set | 96 | # CONFIG_PREEMPT_BKL is not set |
| 97 | CONFIG_HZ_100=y | 97 | # CONFIG_HZ_100 is not set |
| 98 | # CONFIG_HZ_250 is not set | 98 | CONFIG_HZ_250=y |
| 99 | # CONFIG_HZ_1000 is not set | 99 | # CONFIG_HZ_1000 is not set |
| 100 | CONFIG_HZ=100 | 100 | CONFIG_HZ=250 |
| 101 | CONFIG_GENERIC_HARDIRQS=y | 101 | CONFIG_GENERIC_HARDIRQS=y |
| 102 | CONFIG_MSCHUNKS=y | ||
| 103 | CONFIG_LPARCFG=y | 102 | CONFIG_LPARCFG=y |
| 104 | CONFIG_SECCOMP=y | 103 | CONFIG_SECCOMP=y |
| 105 | CONFIG_ISA_DMA_API=y | 104 | CONFIG_ISA_DMA_API=y |