diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-06-20 17:19:40 +0200 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-06-20 17:19:40 +0200 |
| commit | d636b2798732f2cfba48d94aa19b7ba206268a83 (patch) | |
| tree | 40dc52126ab5a1570a000321d93ca4bb03312684 /arch/mips/configs/ip32_defconfig | |
| parent | [DLM] Fix potential conflict in DLM userland locks (diff) | |
| parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
| download | linux-d636b2798732f2cfba48d94aa19b7ba206268a83.tar.xz linux-d636b2798732f2cfba48d94aa19b7ba206268a83.zip | |
Merge branch 'master'
Diffstat (limited to 'arch/mips/configs/ip32_defconfig')
| -rw-r--r-- | arch/mips/configs/ip32_defconfig | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/mips/configs/ip32_defconfig b/arch/mips/configs/ip32_defconfig index 8f11d3565b2d..31b3c92a3841 100644 --- a/arch/mips/configs/ip32_defconfig +++ b/arch/mips/configs/ip32_defconfig @@ -41,8 +41,6 @@ CONFIG_MIPS=y # CONFIG_MIPS_XXS1500 is not set # CONFIG_PNX8550_V2PCI is not set # CONFIG_PNX8550_JBS is not set -# CONFIG_DDB5074 is not set -# CONFIG_DDB5476 is not set # CONFIG_DDB5477 is not set # CONFIG_MACH_VR41XX is not set # CONFIG_PMC_YOSEMITE is not set @@ -136,6 +134,15 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_HZ_48 is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_128 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_256 is not set +CONFIG_HZ_1000=y +# CONFIG_HZ_1024 is not set +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_HZ=1000 # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PREEMPT is not set |