diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-07 13:45:22 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-07 13:45:22 -0500 |
| commit | 8995b161eb142b843094dd614b80e4cce1d66352 (patch) | |
| tree | ffd9988879441d5ec45ab96b2e06f4fcb1210158 /include/asm-arm/arch-versatile/entry-macro.S | |
| parent | cc918c7ab7da017bfaf9661420bb5c462e057cfb (diff) | |
| parent | fe5dd7c73d328b255286b6b65ca19dd34447f709 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include/asm-arm/arch-versatile/entry-macro.S')
| -rw-r--r-- | include/asm-arm/arch-versatile/entry-macro.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-arm/arch-versatile/entry-macro.S b/include/asm-arm/arch-versatile/entry-macro.S index 90e4e970d253..58f0d71759f6 100644 --- a/include/asm-arm/arch-versatile/entry-macro.S +++ b/include/asm-arm/arch-versatile/entry-macro.S | |||
| @@ -7,7 +7,9 @@ | |||
| 7 | * License version 2. This program is licensed "as is" without any | 7 | * License version 2. This program is licensed "as is" without any |
| 8 | * warranty of any kind, whether express or implied. | 8 | * warranty of any kind, whether express or implied. |
| 9 | */ | 9 | */ |
| 10 | .macro disable_fiq | 10 | #include <asm/hardware.h> |
| 11 | |||
| 12 | .macro disable_fiq | ||
| 11 | .endm | 13 | .endm |
| 12 | 14 | ||
| 13 | .macro get_irqnr_and_base, irqnr, irqstat, base, tmp | 15 | .macro get_irqnr_and_base, irqnr, irqstat, base, tmp |