diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2006-07-01 22:29:42 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-02 16:58:53 -0400 |
commit | 1d6f359a2e06296418481239f8054a878f36e819 (patch) | |
tree | e3ce0c69e4f34374f51f4e226374467ca80e3993 /drivers/scsi/megaraid | |
parent | 5d8c8a2e8edc63d8aef7656678f41c6c603f0443 (diff) |
[PATCH] irq-flags: scsi: Use the new IRQF_ constants
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: James Bottomley <James.Bottomley@steeleye.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/scsi/megaraid')
-rw-r--r-- | drivers/scsi/megaraid/megaraid_mbox.c | 2 | ||||
-rw-r--r-- | drivers/scsi/megaraid/megaraid_sas.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c index b7caf60638e8..92715130ac09 100644 --- a/drivers/scsi/megaraid/megaraid_mbox.c +++ b/drivers/scsi/megaraid/megaraid_mbox.c | |||
@@ -767,7 +767,7 @@ megaraid_init_mbox(adapter_t *adapter) | |||
767 | // | 767 | // |
768 | 768 | ||
769 | // request IRQ and register the interrupt service routine | 769 | // request IRQ and register the interrupt service routine |
770 | if (request_irq(adapter->irq, megaraid_isr, SA_SHIRQ, "megaraid", | 770 | if (request_irq(adapter->irq, megaraid_isr, IRQF_SHARED, "megaraid", |
771 | adapter)) { | 771 | adapter)) { |
772 | 772 | ||
773 | con_log(CL_ANN, (KERN_WARNING | 773 | con_log(CL_ANN, (KERN_WARNING |
diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c index 0c9516ff636f..e5c017ccda59 100644 --- a/drivers/scsi/megaraid/megaraid_sas.c +++ b/drivers/scsi/megaraid/megaraid_sas.c | |||
@@ -2191,7 +2191,7 @@ megasas_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
2191 | /* | 2191 | /* |
2192 | * Register IRQ | 2192 | * Register IRQ |
2193 | */ | 2193 | */ |
2194 | if (request_irq(pdev->irq, megasas_isr, SA_SHIRQ, "megasas", instance)) { | 2194 | if (request_irq(pdev->irq, megasas_isr, IRQF_SHARED, "megasas", instance)) { |
2195 | printk(KERN_DEBUG "megasas: Failed to register IRQ\n"); | 2195 | printk(KERN_DEBUG "megasas: Failed to register IRQ\n"); |
2196 | goto fail_irq; | 2196 | goto fail_irq; |
2197 | } | 2197 | } |