Merge ../scsi-misc-2.6
James Bottomley [Mon, 3 Jul 2006 14:41:12 +0000 (09:41 -0500)]
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>

18 files changed:
1  2 
drivers/infiniband/ulp/iser/iscsi_iser.c
drivers/message/fusion/mptbase.c
drivers/message/fusion/mptbase.h
drivers/scsi/53c700.c
drivers/scsi/aic7xxx/aic79xx_osm.h
drivers/scsi/atp870u.c
drivers/scsi/lpfc/lpfc_init.c
drivers/scsi/megaraid/megaraid_sas.c
drivers/scsi/nsp32.c
drivers/scsi/pcmcia/nsp_cs.c
drivers/scsi/qla1280.c
drivers/scsi/qla2xxx/qla_def.h
drivers/scsi/qla2xxx/qla_os.c
drivers/scsi/scsi_debug.c
drivers/scsi/scsi_priv.h
drivers/scsi/scsi_scan.c
drivers/scsi/sd.c
drivers/scsi/sg.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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);
@@@ -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;
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge