diff --git a/[refs] b/[refs] index 786765ea5d15..1ebab88dce7a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0095d58b4a91b9fb57aeb781909355b232517c64 +refs/heads/master: 7bff489a1496d363e9a640c00eb8970da15079dd diff --git a/trunk/include/asm-sh/param.h b/trunk/include/asm-sh/param.h index 1012296e07ab..ae245afdfd6a 100644 --- a/trunk/include/asm-sh/param.h +++ b/trunk/include/asm-sh/param.h @@ -2,11 +2,7 @@ #define __ASM_SH_PARAM_H #ifdef __KERNEL__ -# ifdef CONFIG_SH_WDT -# define HZ 1000 /* Needed for high-res WOVF */ -# else -# define HZ CONFIG_HZ -# endif +# define HZ CONFIG_HZ # define USER_HZ 100 /* User interfaces are in "ticks" */ # define CLOCKS_PER_SEC (USER_HZ) /* frequency at which times() counts */ #endif