diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2006-07-01 22:29:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-02 16:58:47 -0400 |
commit | 121a4226e89aae6654d667d58ab72df740b97b92 (patch) | |
tree | 906a351589bd914dec718a106291cf856a13fcb2 /arch/ia64/sn/pci | |
parent | 4879d77c4c2fdc81ba1ff0ad56fa41b3676d0472 (diff) |
[PATCH] irq-flags: IA64: Use the new IRQF_ constants
Use the new IRQF_ constants and remove the SA_INTERRUPT define
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: "Luck, Tony" <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ia64/sn/pci')
-rw-r--r-- | arch/ia64/sn/pci/pcibr/pcibr_provider.c | 2 | ||||
-rw-r--r-- | arch/ia64/sn/pci/tioca_provider.c | 2 | ||||
-rw-r--r-- | arch/ia64/sn/pci/tioce_provider.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/sn/pci/pcibr/pcibr_provider.c b/arch/ia64/sn/pci/pcibr/pcibr_provider.c index ab1211ef0176..838c93c9a16a 100644 --- a/arch/ia64/sn/pci/pcibr/pcibr_provider.c +++ b/arch/ia64/sn/pci/pcibr/pcibr_provider.c | |||
@@ -139,7 +139,7 @@ pcibr_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont | |||
139 | * register the bridge's error interrupt handler | 139 | * register the bridge's error interrupt handler |
140 | */ | 140 | */ |
141 | if (request_irq(SGI_PCIASIC_ERROR, (void *)pcibr_error_intr_handler, | 141 | if (request_irq(SGI_PCIASIC_ERROR, (void *)pcibr_error_intr_handler, |
142 | SA_SHIRQ, "PCIBR error", (void *)(soft))) { | 142 | IRQF_SHARED, "PCIBR error", (void *)(soft))) { |
143 | printk(KERN_WARNING | 143 | printk(KERN_WARNING |
144 | "pcibr cannot allocate interrupt for error handler\n"); | 144 | "pcibr cannot allocate interrupt for error handler\n"); |
145 | } | 145 | } |
diff --git a/arch/ia64/sn/pci/tioca_provider.c b/arch/ia64/sn/pci/tioca_provider.c index e4aa839d0189..c36b0f5affb3 100644 --- a/arch/ia64/sn/pci/tioca_provider.c +++ b/arch/ia64/sn/pci/tioca_provider.c | |||
@@ -646,7 +646,7 @@ tioca_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont | |||
646 | 646 | ||
647 | if (request_irq(SGI_TIOCA_ERROR, | 647 | if (request_irq(SGI_TIOCA_ERROR, |
648 | tioca_error_intr_handler, | 648 | tioca_error_intr_handler, |
649 | SA_SHIRQ, "TIOCA error", (void *)tioca_common)) | 649 | IRQF_SHARED, "TIOCA error", (void *)tioca_common)) |
650 | printk(KERN_WARNING | 650 | printk(KERN_WARNING |
651 | "%s: Unable to get irq %d. " | 651 | "%s: Unable to get irq %d. " |
652 | "Error interrupts won't be routed for TIOCA bus %d\n", | 652 | "Error interrupts won't be routed for TIOCA bus %d\n", |
diff --git a/arch/ia64/sn/pci/tioce_provider.c b/arch/ia64/sn/pci/tioce_provider.c index 2d7948567ebc..17cd34284886 100644 --- a/arch/ia64/sn/pci/tioce_provider.c +++ b/arch/ia64/sn/pci/tioce_provider.c | |||
@@ -1027,7 +1027,7 @@ tioce_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont | |||
1027 | 1027 | ||
1028 | if (request_irq(SGI_PCIASIC_ERROR, | 1028 | if (request_irq(SGI_PCIASIC_ERROR, |
1029 | tioce_error_intr_handler, | 1029 | tioce_error_intr_handler, |
1030 | SA_SHIRQ, "TIOCE error", (void *)tioce_common)) | 1030 | IRQF_SHARED, "TIOCE error", (void *)tioce_common)) |
1031 | printk(KERN_WARNING | 1031 | printk(KERN_WARNING |
1032 | "%s: Unable to get irq %d. " | 1032 | "%s: Unable to get irq %d. " |
1033 | "Error interrupts won't be routed for " | 1033 | "Error interrupts won't be routed for " |