Merge branch 'master' into upstream

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

diff --git a/include/asm-ppc/open_pic.h b/include/asm-ppc/open_pic.h
index ec2f46629ca28ea177090589d972ed35e07cf95c..a4fe962d9f7301a242393160323945d06bf38524 100644 (file)
--- a/include/asm-ppc/open_pic.h
+++ b/include/asm-ppc/open_pic.h
@@ -12,7 +12,6 @@
 #ifndef _PPC_KERNEL_OPEN_PIC_H
 #define _PPC_KERNEL_OPEN_PIC_H
 
-#include <linux/config.h>
 #include <linux/irq.h>
 
 #define OPENPIC_SIZE   0x40000