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 /include/asm-powerpc/tsi108_irq.h | |
| 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 'include/asm-powerpc/tsi108_irq.h')
| -rw-r--r-- | include/asm-powerpc/tsi108_irq.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-powerpc/tsi108_irq.h b/include/asm-powerpc/tsi108_irq.h index 3e4d04effa57..6ed93979fbe4 100644 --- a/include/asm-powerpc/tsi108_irq.h +++ b/include/asm-powerpc/tsi108_irq.h | |||
| @@ -26,8 +26,8 @@ | |||
| 26 | * demultiplexing on TSI108EMU/SVB boards. | 26 | * demultiplexing on TSI108EMU/SVB boards. |
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #ifndef _ASM_PPC_TSI108_IRQ_H | 29 | #ifndef _ASM_POWERPC_TSI108_IRQ_H |
| 30 | #define _ASM_PPC_TSI108_IRQ_H | 30 | #define _ASM_POWERPC_TSI108_IRQ_H |
| 31 | 31 | ||
| 32 | /* | 32 | /* |
| 33 | * Tsi108 interrupts | 33 | * Tsi108 interrupts |
| @@ -121,4 +121,4 @@ typedef enum { | |||
| 121 | TSI108_IRQ_DIRECTED, | 121 | TSI108_IRQ_DIRECTED, |
| 122 | TSI108_IRQ_DISTRIBUTED, | 122 | TSI108_IRQ_DISTRIBUTED, |
| 123 | } TSI108_IRQ_MODE; | 123 | } TSI108_IRQ_MODE; |
| 124 | #endif /* _ASM_PPC_TSI108_IRQ_H */ | 124 | #endif /* _ASM_POWERPC_TSI108_IRQ_H */ |