Merge branch 'audit.b21' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit...

[linux-2.6-omap-h63xx.git] / include / asm-m68k / irq.h

diff --git a/include/asm-m68k/irq.h b/include/asm-m68k/irq.h
index 325c86f8512d08b50e9dd9e3ed049c1bd975b93a..b4f48b2a6a572c956b8766e24550246c376c1872 100644 (file)
--- a/include/asm-m68k/irq.h
+++ b/include/asm-m68k/irq.h
@@ -1,7 +1,6 @@
 #ifndef _M68K_IRQ_H_
 #define _M68K_IRQ_H_
 
-#include <linux/config.h>
 #include <linux/interrupt.h>
 
 /*
@@ -79,7 +78,7 @@ static __inline__ int irq_canonicalize(int irq)
 
 extern void (*enable_irq)(unsigned int);
 extern void (*disable_irq)(unsigned int);
-#define enable_irq_nosync      enable_irq
+#define disable_irq_nosync     disable_irq
 
 struct pt_regs;