Merge branch 'master' into upstream

[linux-2.6-omap-h63xx.git] / include / asm-powerpc / page.h

diff --git a/include/asm-powerpc/page.h b/include/asm-powerpc/page.h
index a315d0c0d96a964d22c81e4946bdedd565c42d4d..fb597b37c2a2f0deaeadf8cf303105f632fb9aa6 100644 (file)
--- a/include/asm-powerpc/page.h
+++ b/include/asm-powerpc/page.h
@@ -11,7 +11,6 @@
  */
 
 #ifdef __KERNEL__
-#include <linux/config.h>
 #include <asm/asm-compat.h>
 #include <asm/kdump.h>