diff --git a/[refs] b/[refs]
index d9513fe693d5..876e726a4f6d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f5e900770f387d7a4c633b7cef105039f32a85c1
+refs/heads/master: 8e66cda4af84321b308825f1c70aff6bffa30b35
diff --git a/trunk/arch/um/include/asm/Kbuild b/trunk/arch/um/include/asm/Kbuild
index e16895decf4c..5962826ac205 100644
--- a/trunk/arch/um/include/asm/Kbuild
+++ b/trunk/arch/um/include/asm/Kbuild
@@ -1,2 +1,2 @@
 generic-y += bug.h cputime.h device.h emergency-restart.h futex.h hardirq.h
-generic-y += irq_regs.h kdebug.h percpu.h sections.h topology.h xor.h
+generic-y += hw_irq.h irq_regs.h kdebug.h percpu.h sections.h topology.h xor.h
diff --git a/trunk/arch/um/include/asm/hw_irq.h b/trunk/arch/um/include/asm/hw_irq.h
deleted file mode 100644
index 1cf84cf5f21a..000000000000
--- a/trunk/arch/um/include/asm/hw_irq.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _ASM_UM_HW_IRQ_H
-#define _ASM_UM_HW_IRQ_H
-
-#include "asm/irq.h"
-#include "asm/archparam.h"
-
-#endif