Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] Fix build for sim_defconfig

2 files changed, 8 insertions, 9 deletions

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 2d4fcd01bc91..dff9edfc7465 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -232,7 +232,14 @@ config PGTABLE_4
 
 endchoice
 
+if IA64_HP_SIM
+config HZ
+        default 32
+endif
+
+if !IA64_HP_SIM
 source kernel/Kconfig.hz
+endif
 
 config IA64_BRL_EMU
         bool
diff --git a/include/asm-ia64/param.h b/include/asm-ia64/param.h
index 49c62dd5eccf..0964c32c1358 100644
--- a/include/asm-ia64/param.h
+++ b/include/asm-ia64/param.h
@@ -19,15 +19,7 @@
 #define MAXHOSTNAMELEN  64      /* max length of hostname */
 
 #ifdef __KERNEL__
-# ifdef CONFIG_IA64_HP_SIM
-  /*
-   * Yeah, simulating stuff is slow, so let us catch some breath between
-   * timer interrupts...
-   */
-#  define HZ      32
-# else
-#  define HZ    CONFIG_HZ
-# endif
+# define HZ             CONFIG_HZ
 # define USER_HZ        HZ
 # define CLOCKS_PER_SEC HZ      /* frequency at which times() counts */
 #else