diff options
author | Steve French <sfrench@us.ibm.com> | 2006-06-25 15:57:32 +0000 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2006-06-25 15:57:32 +0000 |
commit | bbe5d235ee201705530a7153b57e141cd77d818b (patch) | |
tree | e98c31b4cb2ced6357a87a02596f9ecdbd6dbb26 /include/asm-i386/param.h | |
parent | 189acaaef81b1d71aedd0d28810de24160c2e781 (diff) | |
parent | dfd8317d3340f03bc06eba6b58f0ec0861da4a13 (diff) |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-i386/param.h')
-rw-r--r-- | include/asm-i386/param.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-i386/param.h b/include/asm-i386/param.h index 095580f3a45..745dc5bd0fb 100644 --- a/include/asm-i386/param.h +++ b/include/asm-i386/param.h @@ -2,7 +2,6 @@ #define _ASMi386_PARAM_H #ifdef __KERNEL__ -# include <linux/config.h> # 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() */ |