diff options
| author | Dave Jones <davej@redhat.com> | 2005-11-21 09:56:52 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2005-11-21 09:56:52 -0500 |
| commit | e7e37ee9c547213d726b29c2510cbb6696050405 (patch) | |
| tree | 50c45625de666b23f209d79eb1bfae05c64feee9 /include/asm-arm/arch-imx/irqs.h | |
| parent | c243f1f1f6545985afcc6adf1fc085729029c3ee (diff) | |
| parent | db93a82fa9d8b4d6e31c227922eaae829253bb88 (diff) | |
Merge ../linus/
Diffstat (limited to 'include/asm-arm/arch-imx/irqs.h')
| -rw-r--r-- | include/asm-arm/arch-imx/irqs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-imx/irqs.h b/include/asm-arm/arch-imx/irqs.h index 238197cfb9d9..f195542898e0 100644 --- a/include/asm-arm/arch-imx/irqs.h +++ b/include/asm-arm/arch-imx/irqs.h | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | #define __ARM_IRQS_H__ | 23 | #define __ARM_IRQS_H__ |
| 24 | 24 | ||
| 25 | /* Use the imx definitions */ | 25 | /* Use the imx definitions */ |
| 26 | #include <asm/arch/hardware.h> | 26 | #include <asm/hardware.h> |
| 27 | 27 | ||
| 28 | /* | 28 | /* |
| 29 | * IMX Interrupt numbers | 29 | * IMX Interrupt numbers |