Merge ../linus

[linux-2.6] / arch / mips / defconfig

diff --git a/arch/mips/defconfig b/arch/mips/defconfig
index f72ba3f1b7f5573d8a6dc79c9306d2700c38e1c4..879ba1ad99caf2076bc7c56a302c6166679d02c9 100644 (file)
--- a/arch/mips/defconfig
+++ b/arch/mips/defconfig
@@ -134,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