Merge branch 'master' into upstream

[powerpc.git] / include / linux / types.h

diff --git a/include/linux/types.h b/include/linux/types.h
index 1046c7a..a5e46e7 100644 (file)
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -2,7 +2,6 @@
 #define _LINUX_TYPES_H
 
 #ifdef __KERNEL__
-#include <linux/config.h>
 
 #define BITS_TO_LONGS(bits) \
        (((bits)+BITS_PER_LONG-1)/BITS_PER_LONG)