Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89963d16 authored by Mark Maule's avatar Mark Maule Committed by Tony Luck
Browse files

[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: default avatarMark Maule <maule@sgi.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 674c6479

arch/ia64/sn/pci/pcibr/pcibr_provider.c

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ pcibr_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont 
	/*

	 * 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))) {

		printk(KERN_WARNING

		       "pcibr cannot allocate interrupt for error handler\n");

include/asm-ia64/sn/intr.h

+1 −2
Original line number Diff line number Diff line
@@ -12,13 +12,12 @@ 
#include <linux/rcupdate.h>



#define SGI_UART_VECTOR		(0xe9)

#define SGI_PCIBR_ERROR		(0x33)



/* Reserved IRQs : Note, not to exceed IA64_SN2_FIRST_DEVICE_VECTOR */

#define SGI_XPC_ACTIVATE                (0x30)

#define SGI_II_ERROR                    (0x31)

#define SGI_XBOW_ERROR                  (0x32)

#define SGI_PCIBR_ERROR                 (0x33)

#define SGI_PCIASIC_ERROR               (0x33)

#define SGI_ACPI_SCI_INT                (0x34)

#define SGI_TIOCA_ERROR                 (0x35)

#define SGI_TIO_ERROR                   (0x36)