diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-02-10 14:45:43 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-02-10 14:45:43 -0500 |
| commit | 81b7bbd1932a04869d4c8635a75222dfc6089f96 (patch) | |
| tree | 285ae868a1e3a41fb0dbfe346c28e380949bcb55 /include/asm-mips/rtlx.h | |
| parent | 98051995ab44b993f992946055edc6115351f725 (diff) | |
| parent | 66efc5a7e3061c3597ac43a8bb1026488d57e66b (diff) | |
Merge branch 'linus'
Conflicts:
drivers/scsi/ipr.c
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'include/asm-mips/rtlx.h')
| -rw-r--r-- | include/asm-mips/rtlx.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-mips/rtlx.h b/include/asm-mips/rtlx.h index 76cd51c6be39..59162f74a798 100644 --- a/include/asm-mips/rtlx.h +++ b/include/asm-mips/rtlx.h | |||
| @@ -6,9 +6,10 @@ | |||
| 6 | #ifndef __ASM_RTLX_H | 6 | #ifndef __ASM_RTLX_H |
| 7 | #define __ASM_RTLX_H_ | 7 | #define __ASM_RTLX_H_ |
| 8 | 8 | ||
| 9 | #include <irq.h> | ||
| 10 | |||
| 9 | #define LX_NODE_BASE 10 | 11 | #define LX_NODE_BASE 10 |
| 10 | 12 | ||
| 11 | #define MIPSCPU_INT_BASE 16 | ||
| 12 | #define MIPS_CPU_RTLX_IRQ 0 | 13 | #define MIPS_CPU_RTLX_IRQ 0 |
| 13 | 14 | ||
| 14 | #define RTLX_VERSION 2 | 15 | #define RTLX_VERSION 2 |