diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-05-17 14:51:24 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-05-17 14:51:24 -0400 |
| commit | 5dd8816aeb1f068ade0349a22009ff7a66f25413 (patch) | |
| tree | c56ff327b1dfa8868b4208aea9ac4158e3bfe308 /include/asm-arm/arch-aaec2000/entry-macro.S | |
| parent | f03cc4fd927357bd4b3cea1a053b9f9d8f1731cc (diff) | |
| parent | 0c056c50a6218e0e577817c16ba8851af593d742 (diff) | |
| download | kernel-crypto-5dd8816aeb1f068ade0349a22009ff7a66f25413.tar.gz kernel-crypto-5dd8816aeb1f068ade0349a22009ff7a66f25413.tar.xz kernel-crypto-5dd8816aeb1f068ade0349a22009ff7a66f25413.zip | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'include/asm-arm/arch-aaec2000/entry-macro.S')
| -rw-r--r-- | include/asm-arm/arch-aaec2000/entry-macro.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-arm/arch-aaec2000/entry-macro.S b/include/asm-arm/arch-aaec2000/entry-macro.S index df31313ab07..1eb3503bd16 100644 --- a/include/asm-arm/arch-aaec2000/entry-macro.S +++ b/include/asm-arm/arch-aaec2000/entry-macro.S @@ -10,6 +10,7 @@ * published by the Free Software Foundation. * */ +#include <asm/arch/irqs.h> .macro disable_fiq .endm |