Merge branch 'master' into upstream

[linux-2.6-omap-h63xx.git] / include / asm-x86_64 / param.h

diff --git a/include/asm-x86_64/param.h b/include/asm-x86_64/param.h
index 5956b23b57c247d6a18a911469a54e312007429b..a728786c3c7c0376f8dfac4ecf3365c70ce31ff9 100644 (file)
--- a/include/asm-x86_64/param.h
+++ b/include/asm-x86_64/param.h
@@ -2,7 +2,6 @@
 #define _ASMx86_64_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() */