diff --git a/[refs] b/[refs]
index 6c702695faa9..5764b198c2cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af85fe9e5e618de205ac6944ed9fe45ade0874bf
+refs/heads/master: e77d15511fc4e1554c500524dd43b9c162a2d95e
diff --git a/trunk/arch/m68k/include/asm/hw_irq.h b/trunk/arch/m68k/include/asm/hw_irq.h
index e19526015890..eacef0951fbf 100644
--- a/trunk/arch/m68k/include/asm/hw_irq.h
+++ b/trunk/arch/m68k/include/asm/hw_irq.h
@@ -1,5 +1,6 @@
-#ifdef __uClinux__
-#include "hw_irq_no.h"
-#else
-#include "hw_irq_mm.h"
+#ifndef __ASM_M68K_HW_IRQ_H
+#define __ASM_M68K_HW_IRQ_H
+
+/* Dummy include. */
+
 #endif
diff --git a/trunk/arch/m68k/include/asm/hw_irq_mm.h b/trunk/arch/m68k/include/asm/hw_irq_mm.h
deleted file mode 100644
index eacef0951fbf..000000000000
--- a/trunk/arch/m68k/include/asm/hw_irq_mm.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_M68K_HW_IRQ_H
-#define __ASM_M68K_HW_IRQ_H
-
-/* Dummy include. */
-
-#endif
diff --git a/trunk/arch/m68k/include/asm/hw_irq_no.h b/trunk/arch/m68k/include/asm/hw_irq_no.h
deleted file mode 100644
index f3ec9e5ae049..000000000000
--- a/trunk/arch/m68k/include/asm/hw_irq_no.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef __M68KNOMMU_HW_IRQ_H__
-#define __M68KNOMMU_HW_IRQ_H__
-
-#endif /* __M68KNOMMU_HW_IRQ_H__ */