diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-29 13:37:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-29 13:37:42 -0700 |
| commit | 2cd6c7f7f1e3a116506bb3326f0d23a6b801638a (patch) | |
| tree | 0c7b2de254ebd00999b3fd81f0941ea32eb9e14e /arch/sparc/kernel/irq.h | |
| parent | 380dc2008824473450b0c6596dcd429965a4a9da (diff) | |
| parent | 38f7f8f05e8239e9871f7e1c4b0a842080e85315 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc32,sun4d: Change IPI IRQ level to prevent collision between IPI and timer interrupt
sparc: Remove another reference to nfsservctl
Diffstat (limited to 'arch/sparc/kernel/irq.h')
| -rw-r--r-- | arch/sparc/kernel/irq.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/irq.h b/arch/sparc/kernel/irq.h index 100b9c204e78..42851122bbd9 100644 --- a/arch/sparc/kernel/irq.h +++ b/arch/sparc/kernel/irq.h @@ -88,7 +88,7 @@ BTFIXUPDEF_CALL(void, set_irq_udt, int) #define set_irq_udt(cpu) BTFIXUP_CALL(set_irq_udt)(cpu) /* All SUN4D IPIs are sent on this IRQ, may be shared with hard IRQs */ -#define SUN4D_IPI_IRQ 14 +#define SUN4D_IPI_IRQ 13 extern void sun4d_ipi_interrupt(void); |