Merge branch 'configs-3.5' into pf-3.5

NigelCunningham · Aug 16, 2012 · e9299b4 · e9299b4
2 parents a9850ca + 10a3450
commit e9299b4
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/configs/dell-inspiron-1525.config b/configs/dell-inspiron-1525.config
@@ -460,9 +460,16 @@ CONFIG_ARCH_RANDOM=y
 CONFIG_SECCOMP=y
 # CONFIG_CC_STACKPROTECTOR is not set
 # CONFIG_HZ_100 is not set
-# CONFIG_HZ_250 is not set
+# CONFIG_HZ_250_NODEFAULT is not set
 # CONFIG_HZ_300 is not set
 CONFIG_HZ_1000=y
+# CONFIG_HZ_1500 is not set
+# CONFIG_HZ_2000 is not set
+# CONFIG_HZ_3000 is not set
+# CONFIG_HZ_4000 is not set
+# CONFIG_HZ_5000 is not set
+# CONFIG_HZ_7500 is not set
+# CONFIG_HZ_10000 is not set
 CONFIG_HZ=1000
 CONFIG_SCHED_HRTICK=y
 CONFIG_KEXEC=y