From: James Bottomley <jejb@mulgrave.il.steeleye.com>
Date: Mon, 3 Jul 2006 14:41:12 +0000 (-0500)
Subject: Merge ../scsi-misc-2.6
X-Git-Tag: v2.6.18-rc1~22^2
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=c4e00fac42f268ed0a547cdd1d12bb8399864040

Merge ../scsi-misc-2.6

Conflicts:

	drivers/scsi/nsp32.c
	drivers/scsi/pcmcia/nsp_cs.c

Removal of randomness flag conflicts with SA_ -> IRQF_ global
replacement.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
---

c4e00fac42f268ed0a547cdd1d12bb8399864040
diff --cc drivers/scsi/nsp32.c
index bd337a9,4190788..bfb4f49
--- a/drivers/scsi/nsp32.c
+++ b/drivers/scsi/nsp32.c
@@@ -2866,8 -2866,7 +2866,7 @@@ static int nsp32_detect(struct scsi_hos
  	 */
  	nsp32_do_bus_reset(data);
  
- 	ret = request_irq(host->irq, do_nsp32_isr,
- 			  IRQF_SHARED | IRQF_SAMPLE_RANDOM, "nsp32", data);
 -	ret = request_irq(host->irq, do_nsp32_isr, SA_SHIRQ, "nsp32", data);
++	ret = request_irq(host->irq, do_nsp32_isr, IRQF_SHARED, "nsp32", data);
  	if (ret < 0) {
  		nsp32_msg(KERN_ERR, "Unable to allocate IRQ for NinjaSCSI32 "
  			  "SCSI PCI controller. Interrupt: %d", host->irq);
diff --cc drivers/scsi/pcmcia/nsp_cs.c
index 7ff5851,bb81218..0d4c04e
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@@ -1623,7 -1623,7 +1623,7 @@@ static int nsp_cs_probe(struct pcmcia_d
  	/* Interrupt handler */
  	link->irq.Handler	 = &nspintr;
  	link->irq.Instance       = info;
- 	link->irq.Attributes     |= (IRQF_SHARED | IRQF_SAMPLE_RANDOM);
 -	link->irq.Attributes     |= SA_SHIRQ;
++	link->irq.Attributes     |= IRQF_SHARED;
  
  	/* General socket configuration */
  	link->conf.Attributes	 = CONF_ENABLE_IRQ;