diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-06 15:12:59 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-06 15:12:59 -0400 |
| commit | c7b0807b9d4faddd87a75a5acb079e5dbfedd211 (patch) | |
| tree | 2d5978467086607efa0e5233c493c77ecffd9ea8 /arch/arm/plat-mxc | |
| parent | fdc0867884ec0fc78091e28efa1d439affb5eb20 (diff) | |
| parent | 3e62af821050668a0c8915121838569ae59359be (diff) | |
Merge branch 'imx/sparse-irq' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/irq
Two bug fixes for the previous state of the imx sparse irq changes.
* 'imx/sparse-irq' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: imx: select USE_OF
ARM: imx: Fix build error due to missing irqs.h include
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/plat-mxc')
| -rw-r--r-- | arch/arm/plat-mxc/avic.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/avic.c b/arch/arm/plat-mxc/avic.c index f3d671ff7f1b..cbd55c36def3 100644 --- a/arch/arm/plat-mxc/avic.c +++ b/arch/arm/plat-mxc/avic.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <asm/mach/irq.h> | 26 | #include <asm/mach/irq.h> |
| 27 | #include <asm/exception.h> | 27 | #include <asm/exception.h> |
| 28 | #include <mach/hardware.h> | 28 | #include <mach/hardware.h> |
| 29 | #include <mach/irqs.h> | ||
| 29 | 30 | ||
| 30 | #include "irq-common.h" | 31 | #include "irq-common.h" |
| 31 | 32 | ||