diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 00:57:05 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 00:57:05 -0400 |
| commit | 5bc65793cbf8da0d35f19ef025dda22887e79e80 (patch) | |
| tree | 8291998abd73055de6f487fafa174ee2a5d3afee /arch/arm/mach-iop32x/irq.c | |
| parent | 6edae708bf77e012d855a7e2c7766f211d234f4f (diff) | |
| parent | 3f0a6766e0cc5a577805732e5adb50a585c58175 (diff) | |
[SCSI] Merge up to linux-2.6 head
Conflicts:
drivers/scsi/jazz_esp.c
Same changes made by both SCSI and SPARC trees: problem with UTF-8
conversion in the copyright.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'arch/arm/mach-iop32x/irq.c')
| -rw-r--r-- | arch/arm/mach-iop32x/irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-iop32x/irq.c b/arch/arm/mach-iop32x/irq.c index 82598dc18d80..c971171c2905 100644 --- a/arch/arm/mach-iop32x/irq.c +++ b/arch/arm/mach-iop32x/irq.c | |||
| @@ -21,12 +21,12 @@ | |||
| 21 | 21 | ||
| 22 | static u32 iop32x_mask; | 22 | static u32 iop32x_mask; |
| 23 | 23 | ||
| 24 | static inline void intctl_write(u32 val) | 24 | static void intctl_write(u32 val) |
| 25 | { | 25 | { |
| 26 | asm volatile("mcr p6, 0, %0, c0, c0, 0" : : "r" (val)); | 26 | asm volatile("mcr p6, 0, %0, c0, c0, 0" : : "r" (val)); |
| 27 | } | 27 | } |
| 28 | 28 | ||
| 29 | static inline void intstr_write(u32 val) | 29 | static void intstr_write(u32 val) |
| 30 | { | 30 | { |
| 31 | asm volatile("mcr p6, 0, %0, c4, c0, 0" : : "r" (val)); | 31 | asm volatile("mcr p6, 0, %0, c4, c0, 0" : : "r" (val)); |
| 32 | } | 32 | } |