Merge tag 'irq-mmp' of...

Merge tag 'irq-mmp' of https://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux into next/cleanup

Merge a mach header include removal from Haojian Zhuang.

* tag 'irq-mmp' of https://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux:
  irqchip: mmp: avoid use head file in a specific arch
Signed-off-by: Olof Johansson <olof@lixom.net>

drivers/irqchip/irq-mmp.c

@@ -22,7 +22,7 @@
 #include <linux/of_irq.h>
 
 #include <asm/exception.h>
-#include <asm/mach/irq.h>
+#include <asm/hardirq.h>
 
 #include "irqchip.h"