diff options
-rw-r--r-- | arch/ia64/sn/pci/pcibr/pcibr_provider.c | 2 | ||||
-rw-r--r-- | include/asm-ia64/sn/intr.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/ia64/sn/pci/pcibr/pcibr_provider.c b/arch/ia64/sn/pci/pcibr/pcibr_provider.c index dfaf01e5be80..f8cfe8acdc3c 100644 --- a/arch/ia64/sn/pci/pcibr/pcibr_provider.c +++ b/arch/ia64/sn/pci/pcibr/pcibr_provider.c | |||
@@ -115,7 +115,7 @@ pcibr_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont | |||
115 | /* | 115 | /* |
116 | * register the bridge's error interrupt handler | 116 | * register the bridge's error interrupt handler |
117 | */ | 117 | */ |
118 | if (request_irq(SGI_PCIBR_ERROR, (void *)pcibr_error_intr_handler, | 118 | if (request_irq(SGI_PCIASIC_ERROR, (void *)pcibr_error_intr_handler, |
119 | SA_SHIRQ, "PCIBR error", (void *)(soft))) { | 119 | SA_SHIRQ, "PCIBR error", (void *)(soft))) { |
120 | printk(KERN_WARNING | 120 | printk(KERN_WARNING |
121 | "pcibr cannot allocate interrupt for error handler\n"); | 121 | "pcibr cannot allocate interrupt for error handler\n"); |
diff --git a/include/asm-ia64/sn/intr.h b/include/asm-ia64/sn/intr.h index e190dd4213d5..e35074f526d9 100644 --- a/include/asm-ia64/sn/intr.h +++ b/include/asm-ia64/sn/intr.h | |||
@@ -12,13 +12,12 @@ | |||
12 | #include <linux/rcupdate.h> | 12 | #include <linux/rcupdate.h> |
13 | 13 | ||
14 | #define SGI_UART_VECTOR (0xe9) | 14 | #define SGI_UART_VECTOR (0xe9) |
15 | #define SGI_PCIBR_ERROR (0x33) | ||
16 | 15 | ||
17 | /* Reserved IRQs : Note, not to exceed IA64_SN2_FIRST_DEVICE_VECTOR */ | 16 | /* Reserved IRQs : Note, not to exceed IA64_SN2_FIRST_DEVICE_VECTOR */ |
18 | #define SGI_XPC_ACTIVATE (0x30) | 17 | #define SGI_XPC_ACTIVATE (0x30) |
19 | #define SGI_II_ERROR (0x31) | 18 | #define SGI_II_ERROR (0x31) |
20 | #define SGI_XBOW_ERROR (0x32) | 19 | #define SGI_XBOW_ERROR (0x32) |
21 | #define SGI_PCIBR_ERROR (0x33) | 20 | #define SGI_PCIASIC_ERROR (0x33) |
22 | #define SGI_ACPI_SCI_INT (0x34) | 21 | #define SGI_ACPI_SCI_INT (0x34) |
23 | #define SGI_TIOCA_ERROR (0x35) | 22 | #define SGI_TIOCA_ERROR (0x35) |
24 | #define SGI_TIO_ERROR (0x36) | 23 | #define SGI_TIO_ERROR (0x36) |