From 616ff36ded044108cdccdaa11cee37403f48f5a8 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Tue, 8 May 2007 00:28:52 -0700 Subject: [PATCH] --- yaml --- r: 54653 b: refs/heads/master c: 2833bf68b9634a02895d9463349d8c21bd32ccf6 h: refs/heads/master i: 54651: d431ddf5a69ee0148df90191576bfab6575a8830 v: v3 --- [refs] | 2 +- trunk/arch/mips/sni/irq.c | 2 +- trunk/drivers/scsi/sni_53c710.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f067e8d76a48..0e6cecdd5ef8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9730b5b06fee7ffd1f0150855f03cf319c0e004f +refs/heads/master: 2833bf68b9634a02895d9463349d8c21bd32ccf6 diff --git a/trunk/arch/mips/sni/irq.c b/trunk/arch/mips/sni/irq.c index ad5fc471a004..9ccffdfb8289 100644 --- a/trunk/arch/mips/sni/irq.c +++ b/trunk/arch/mips/sni/irq.c @@ -42,7 +42,7 @@ static irqreturn_t sni_isa_irq_handler(int dummy, void *p) struct irqaction sni_isa_irq = { .handler = sni_isa_irq_handler, .name = "ISA", - .flags = SA_SHIRQ + .flags = IRQF_SHARED }; /* diff --git a/trunk/drivers/scsi/sni_53c710.c b/trunk/drivers/scsi/sni_53c710.c index 6bc505115841..a7dfb65fb842 100644 --- a/trunk/drivers/scsi/sni_53c710.c +++ b/trunk/drivers/scsi/sni_53c710.c @@ -98,7 +98,7 @@ static int __init snirm710_probe(struct platform_device *dev) host->this_id = 7; host->base = base; host->irq = platform_get_irq(dev, 0); - if(request_irq(host->irq, NCR_700_intr, SA_SHIRQ, "snirm710", host)) { + if(request_irq(host->irq, NCR_700_intr, IRQF_SHARED, "snirm710", host)) { printk(KERN_ERR "snirm710: request_irq failed!\n"); goto out_put_host; }