Merge branch 'master' into upstream

[linux-2.6] / include / asm-ppc / io.h

diff --git a/include/asm-ppc/io.h b/include/asm-ppc/io.h
index b919d8fb7d98b8771a6037c346630e0c86be7191..89c6f1bc3aaba0eb27511d536eb0ffe5985001e7 100644 (file)
--- a/include/asm-ppc/io.h
+++ b/include/asm-ppc/io.h
@@ -2,7 +2,6 @@
 #ifndef _PPC_IO_H
 #define _PPC_IO_H
 
-#include <linux/config.h>
 #include <linux/string.h>
 #include <linux/types.h>