diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
| commit | 577f99c1d08cf9cbdafd4e858dd13ff04d855090 (patch) | |
| tree | 0f726bbda9b18d311d4c95198bbd96cb7ac01db0 /include/asm-mips/mach-lasat/irq.h | |
| parent | 26c0f03f6b77c513cb7bc37b73a06819bdbb791b (diff) | |
| parent | 2f633928cbba8a5858bb39b11e7219a41b0fbef5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/rt2x00/rt2x00dev.c
net/8021q/vlan_dev.c
Diffstat (limited to 'include/asm-mips/mach-lasat/irq.h')
| -rw-r--r-- | include/asm-mips/mach-lasat/irq.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/mach-lasat/irq.h b/include/asm-mips/mach-lasat/irq.h index da75f89f3723..3a282419d5f9 100644 --- a/include/asm-mips/mach-lasat/irq.h +++ b/include/asm-mips/mach-lasat/irq.h | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #ifndef _ASM_MACH_LASAT_IRQ_H | 1 | #ifndef _ASM_MACH_LASAT_IRQ_H |
| 2 | #define _ASM_MACH_LASAT_IRQ_H | 2 | #define _ASM_MACH_LASAT_IRQ_H |
| 3 | 3 | ||
| 4 | #define LASAT_CASCADE_IRQ (MIPS_CPU_IRQ_BASE + 0) | 4 | #define LASAT_CASCADE_IRQ (MIPS_CPU_IRQ_BASE + 2) |
| 5 | 5 | ||
| 6 | #define LASAT_IRQ_BASE 8 | 6 | #define LASAT_IRQ_BASE 8 |
| 7 | #define LASAT_IRQ_END 23 | 7 | #define LASAT_IRQ_END 23 |