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/pcmcia | |
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/pcmcia')
-rw-r--r-- | drivers/scsi/pcmcia/nsp_cs.c | 2 | ||||
-rw-r--r-- | drivers/scsi/pcmcia/sym53c500_cs.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c index 231f9c311c69..7ff5851c040b 100644 --- a/drivers/scsi/pcmcia/nsp_cs.c +++ b/drivers/scsi/pcmcia/nsp_cs.c | |||
@@ -1623,7 +1623,7 @@ static int nsp_cs_probe(struct pcmcia_device *link) | |||
1623 | /* Interrupt handler */ | 1623 | /* Interrupt handler */ |
1624 | link->irq.Handler = &nspintr; | 1624 | link->irq.Handler = &nspintr; |
1625 | link->irq.Instance = info; | 1625 | link->irq.Instance = info; |
1626 | link->irq.Attributes |= (SA_SHIRQ | SA_SAMPLE_RANDOM); | 1626 | link->irq.Attributes |= (IRQF_SHARED | IRQF_SAMPLE_RANDOM); |
1627 | 1627 | ||
1628 | /* General socket configuration */ | 1628 | /* General socket configuration */ |
1629 | link->conf.Attributes = CONF_ENABLE_IRQ; | 1629 | link->conf.Attributes = CONF_ENABLE_IRQ; |
diff --git a/drivers/scsi/pcmcia/sym53c500_cs.c b/drivers/scsi/pcmcia/sym53c500_cs.c index 9f59827707f0..0b65099acb1a 100644 --- a/drivers/scsi/pcmcia/sym53c500_cs.c +++ b/drivers/scsi/pcmcia/sym53c500_cs.c | |||
@@ -799,7 +799,7 @@ next_entry: | |||
799 | data = (struct sym53c500_data *)host->hostdata; | 799 | data = (struct sym53c500_data *)host->hostdata; |
800 | 800 | ||
801 | if (irq_level > 0) { | 801 | if (irq_level > 0) { |
802 | if (request_irq(irq_level, SYM53C500_intr, SA_SHIRQ, "SYM53C500", host)) { | 802 | if (request_irq(irq_level, SYM53C500_intr, IRQF_SHARED, "SYM53C500", host)) { |
803 | printk("SYM53C500: unable to allocate IRQ %d\n", irq_level); | 803 | printk("SYM53C500: unable to allocate IRQ %d\n", irq_level); |
804 | goto err_free_scsi; | 804 | goto err_free_scsi; |
805 | } | 805 | } |