Merge branch 'for-linus' of git://www.jni.nu/cris

[linux-2.6] / include / asm-x86 / i8259.h

diff --git a/include/asm-x86/i8259.h b/include/asm-x86/i8259.h
index e2650f21ca8d30892c94747a4438921c27c65eae..2f98df91f1f2bef9e7fc7bc47b3a42bbe14403d3 100644 (file)
--- a/include/asm-x86/i8259.h
+++ b/include/asm-x86/i8259.h
@@ -5,7 +5,7 @@
 
 extern unsigned int cached_irq_mask;
 
-#define __byte(x,y)            (((unsigned char *) &(y))[x])
+#define __byte(x, y)           (((unsigned char *)&(y))[x])
 #define cached_master_mask     (__byte(0, cached_irq_mask))
 #define cached_slave_mask      (__byte(1, cached_irq_mask))
 
@@ -55,4 +55,6 @@ static inline void outb_pic(unsigned char value, unsigned int port)
        udelay(2);
 }
 
+extern struct irq_chip i8259A_chip;
+
 #endif /* __ASM_I8259_H__ */