diff options
| author | Olof Johansson <olof@lixom.net> | 2014-03-09 11:46:04 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-03-09 11:46:36 -0700 |
| commit | dba5bedb96b0956a544b363227fd081d97701fd5 (patch) | |
| tree | b5bd386b970e1474ba652c264b0292c40a52613c /drivers/irqchip | |
| parent | 6ddc1d3413a099d903cdc75e5d93b62e3bcff751 (diff) | |
| parent | 13dde81828eee39086ffce334a7a9996ef5104ab (diff) | |
| download | talos-obmc-linux-dba5bedb96b0956a544b363227fd081d97701fd5.tar.gz talos-obmc-linux-dba5bedb96b0956a544b363227fd081d97701fd5.zip | |
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>
Diffstat (limited to 'drivers/irqchip')
| -rw-r--r-- | drivers/irqchip/irq-mmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/irqchip/irq-mmp.c b/drivers/irqchip/irq-mmp.c index 2cb7cd0bc2f5..470c5de35ce4 100644 --- a/drivers/irqchip/irq-mmp.c +++ b/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" |
