diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 12:17:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 12:17:40 -0700 |
| commit | 5b6b54982258c330247957a8d877b9851ac69d53 (patch) | |
| tree | 567e4b3391e0c6689cf511789fb512ef7385c16f /include/asm-sh/param.h | |
| parent | 35c74823cb382c610be908f1b92f980b84e7c37c (diff) | |
| parent | 39374aadcd0159b4744ab456f4efa100bea84bd4 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6: (38 commits)
sh: R7785RP board updates.
sh: Update r7780rp defconfig.
sh: Add die chain notifiers.
sh: Fix APM emulation on hp6xx.
sh: Wire up more IRQs for SH7709.
sh: Solution Engine 7722 board support.
sh: Fix r7780rp build.
sh: kdump support.
sh: Move clock reporting to its own proc entry.
sh: Solution Engine SH7705 board and CPU updates.
serial: sh-sci: Fix module clock refcount for serial console.
serial: sh-sci: Fix module clock refcounting.
sh: SH7722 clock framework support.
sh: hp6xx pata_platform support.
sh: Obey CONFIG_HZ for HZ definition.
sh: Fix fstatat64() syscall.
sh: se7780 PCI support.
sh: SH7780 Solution Engine board support.
sh: Add a dummy SH-4 PCIC fixup.
sh: Tidy up L-BOX area5 addresses.
...
Diffstat (limited to 'include/asm-sh/param.h')
| -rw-r--r-- | include/asm-sh/param.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sh/param.h b/include/asm-sh/param.h index ce13064fec2..1012296e07a 100644 --- a/include/asm-sh/param.h +++ b/include/asm-sh/param.h @@ -5,7 +5,7 @@ # ifdef CONFIG_SH_WDT # define HZ 1000 /* Needed for high-res WOVF */ # else -# define HZ 100 +# define HZ CONFIG_HZ # endif # define USER_HZ 100 /* User interfaces are in "ticks" */ # define CLOCKS_PER_SEC (USER_HZ) /* frequency at which times() counts */ |