diff --git a/[refs] b/[refs] index faa88f305149..3ea231fd804f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1a823ac9ff09cbdf39201df37b7ede1f9395de83 +refs/heads/master: 860f7be283f8b8d7830a741cb72338057a753283 diff --git a/trunk/arch/mn10300/Kconfig b/trunk/arch/mn10300/Kconfig index eedc3a5e0d9b..6a6409adc564 100644 --- a/trunk/arch/mn10300/Kconfig +++ b/trunk/arch/mn10300/Kconfig @@ -63,6 +63,10 @@ config GENERIC_HARDIRQS config HOTPLUG_CPU def_bool n +config HZ + int + default 1000 + mainmenu "Matsushita MN10300/AM33 Kernel Configuration" source "init/Kconfig" diff --git a/trunk/include/asm-mn10300/param.h b/trunk/include/asm-mn10300/param.h index 54b883ec3906..789b1df41fcb 100644 --- a/trunk/include/asm-mn10300/param.h +++ b/trunk/include/asm-mn10300/param.h @@ -12,7 +12,7 @@ #define _ASM_PARAM_H #ifdef __KERNEL__ -#define HZ 1000 /* Internal kernel timer frequency */ +#define HZ CONFIG_HZ /* Internal kernel timer frequency */ #define USER_HZ 100 /* .. some user interfaces are in * "ticks" */ #define CLOCKS_PER_SEC (USER_HZ) /* like times() */