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 40b11937180d37afc8bd32034bba45dafd6891ec..a728786c3c7c0376f8dfac4ecf3365c70ce31ff9 100644 (file)
--- a/include/asm-x86_64/param.h
+++ b/include/asm-x86_64/param.h
@@ -1,5 +1,3 @@
-#include <linux/config.h>
-
 #ifndef _ASMx86_64_PARAM_H
 #define _ASMx86_64_PARAM_H