Merge git://git.kernel.org/pub/scm/linux/kernel/git/bcollins/linux1394-2.6

[powerpc.git] / include / asm-m68knommu / irq.h

diff --git a/include/asm-m68knommu/irq.h b/include/asm-m68knommu/irq.h
index a08fa9b..2b40884 100644 (file)
--- a/include/asm-m68knommu/irq.h
+++ b/include/asm-m68knommu/irq.h
@@ -1,7 +1,6 @@
 #ifndef _M68K_IRQ_H_
 #define _M68K_IRQ_H_
 
-#include <linux/config.h>
 #include <asm/ptrace.h>
 
 #ifdef CONFIG_COLDFIRE
@@ -84,10 +83,8 @@ extern void (*mach_disable_irq)(unsigned int);
 /*
  * Some drivers want these entry points
  */
-#define enable_irq(x)  (mach_enable_irq  ? (*mach_enable_irq)(x)  : 0)
-#define disable_irq(x) (mach_disable_irq ? (*mach_disable_irq)(x) : 0)
-
-#define enable_irq_nosync(x)   enable_irq(x)
+#define enable_irq(x)  0
+#define disable_irq(x) do { } while (0)
 #define disable_irq_nosync(x)  disable_irq(x)
 
 struct irqaction;