diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 08:59:45 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 08:59:45 -0400 |
| commit | d59bf96cdde5b874a57bfd1425faa45da915d0b7 (patch) | |
| tree | 351a40b72514d620e5bebea2de38c26f23277ffc /arch/mips/configs/malta_defconfig | |
| parent | 28df955a2ad484d602314b30183ea8496a9aa34a (diff) | |
| parent | 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'arch/mips/configs/malta_defconfig')
| -rw-r--r-- | arch/mips/configs/malta_defconfig | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig index 977f52be51dc..b73cff0d83ca 100644 --- a/arch/mips/configs/malta_defconfig +++ b/arch/mips/configs/malta_defconfig | |||
| @@ -41,8 +41,6 @@ CONFIG_MIPS_MALTA=y | |||
| 41 | # CONFIG_MIPS_XXS1500 is not set | 41 | # CONFIG_MIPS_XXS1500 is not set |
| 42 | # CONFIG_PNX8550_V2PCI is not set | 42 | # CONFIG_PNX8550_V2PCI is not set |
| 43 | # CONFIG_PNX8550_JBS is not set | 43 | # CONFIG_PNX8550_JBS is not set |
| 44 | # CONFIG_DDB5074 is not set | ||
| 45 | # CONFIG_DDB5476 is not set | ||
| 46 | # CONFIG_DDB5477 is not set | 44 | # CONFIG_DDB5477 is not set |
| 47 | # CONFIG_MACH_VR41XX is not set | 45 | # CONFIG_MACH_VR41XX is not set |
| 48 | # CONFIG_PMC_YOSEMITE is not set | 46 | # CONFIG_PMC_YOSEMITE is not set |
| @@ -154,6 +152,15 @@ CONFIG_FLATMEM=y | |||
| 154 | CONFIG_FLAT_NODE_MEM_MAP=y | 152 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 155 | # CONFIG_SPARSEMEM_STATIC is not set | 153 | # CONFIG_SPARSEMEM_STATIC is not set |
| 156 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 154 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 155 | # CONFIG_HZ_48 is not set | ||
| 156 | CONFIG_HZ_100=y | ||
| 157 | # CONFIG_HZ_128 is not set | ||
| 158 | # CONFIG_HZ_250 is not set | ||
| 159 | # CONFIG_HZ_256 is not set | ||
| 160 | # CONFIG_HZ_1000 is not set | ||
| 161 | # CONFIG_HZ_1024 is not set | ||
| 162 | CONFIG_SYS_SUPPORTS_ARBIT_HZ=y | ||
| 163 | CONFIG_HZ=100 | ||
| 157 | CONFIG_PREEMPT_NONE=y | 164 | CONFIG_PREEMPT_NONE=y |
| 158 | # CONFIG_PREEMPT_VOLUNTARY is not set | 165 | # CONFIG_PREEMPT_VOLUNTARY is not set |
| 159 | # CONFIG_PREEMPT is not set | 166 | # CONFIG_PREEMPT is not set |