diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-02-15 22:06:08 +0100 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-02-15 22:06:08 +0100 |
| commit | 0a3abcf75bf391fec4e32356ab5ddb8f5d2e6b41 (patch) | |
| tree | b80b1d344ec24cad28b057ef803cebac9434be01 /include/asm-sparc/param.h | |
| parent | [CIFS] factoring out common code in get_inode_info functions (diff) | |
| parent | Linux 2.6.25-rc2 (diff) | |
| download | linux-0a3abcf75bf391fec4e32356ab5ddb8f5d2e6b41.tar.xz linux-0a3abcf75bf391fec4e32356ab5ddb8f5d2e6b41.zip | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-sparc/param.h')
| -rw-r--r-- | include/asm-sparc/param.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sparc/param.h b/include/asm-sparc/param.h index beaf02d364f2..86ba59af9d2c 100644 --- a/include/asm-sparc/param.h +++ b/include/asm-sparc/param.h @@ -3,7 +3,7 @@ #define _ASMSPARC_PARAM_H #ifdef __KERNEL__ -# define HZ 100 /* 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) #endif |