[IA64-SGI] altix: cosmetic rename of SGI_PCIBR_ERROR
Cosmetic altix patch to rename SGI_PCIBR_ERROR to something more generic and remove a duplicate #define. Signed-off-by: Mark Maule <maule@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
This commit is contained in:
parent
674c6479b7
commit
89963d16dc
|
@ -115,7 +115,7 @@ pcibr_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont
|
||||||
/*
|
/*
|
||||||
* register the bridge's error interrupt handler
|
* register the bridge's error interrupt handler
|
||||||
*/
|
*/
|
||||||
if (request_irq(SGI_PCIBR_ERROR, (void *)pcibr_error_intr_handler,
|
if (request_irq(SGI_PCIASIC_ERROR, (void *)pcibr_error_intr_handler,
|
||||||
SA_SHIRQ, "PCIBR error", (void *)(soft))) {
|
SA_SHIRQ, "PCIBR error", (void *)(soft))) {
|
||||||
printk(KERN_WARNING
|
printk(KERN_WARNING
|
||||||
"pcibr cannot allocate interrupt for error handler\n");
|
"pcibr cannot allocate interrupt for error handler\n");
|
||||||
|
|
|
@ -12,13 +12,12 @@
|
||||||
#include <linux/rcupdate.h>
|
#include <linux/rcupdate.h>
|
||||||
|
|
||||||
#define SGI_UART_VECTOR (0xe9)
|
#define SGI_UART_VECTOR (0xe9)
|
||||||
#define SGI_PCIBR_ERROR (0x33)
|
|
||||||
|
|
||||||
/* Reserved IRQs : Note, not to exceed IA64_SN2_FIRST_DEVICE_VECTOR */
|
/* Reserved IRQs : Note, not to exceed IA64_SN2_FIRST_DEVICE_VECTOR */
|
||||||
#define SGI_XPC_ACTIVATE (0x30)
|
#define SGI_XPC_ACTIVATE (0x30)
|
||||||
#define SGI_II_ERROR (0x31)
|
#define SGI_II_ERROR (0x31)
|
||||||
#define SGI_XBOW_ERROR (0x32)
|
#define SGI_XBOW_ERROR (0x32)
|
||||||
#define SGI_PCIBR_ERROR (0x33)
|
#define SGI_PCIASIC_ERROR (0x33)
|
||||||
#define SGI_ACPI_SCI_INT (0x34)
|
#define SGI_ACPI_SCI_INT (0x34)
|
||||||
#define SGI_TIOCA_ERROR (0x35)
|
#define SGI_TIOCA_ERROR (0x35)
|
||||||
#define SGI_TIO_ERROR (0x36)
|
#define SGI_TIO_ERROR (0x36)
|
||||||
|
|
Loading…
Reference in New Issue