Merge ../scsi-misc-2.6

[sfrench/cifs-2.6.git] / drivers / scsi / pcmcia / nsp_cs.c

diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index 7ff5851c040b290dcbf532c31de00d9a5a0e3fb2..0d4c04e1f3de3f941655ec67a023992e77d46f04 100644 (file)
--- 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)
        /* Interrupt handler */
        link->irq.Handler        = &nspintr;
        link->irq.Instance       = info;
-       link->irq.Attributes     |= (IRQF_SHARED | IRQF_SAMPLE_RANDOM);
+       link->irq.Attributes     |= IRQF_SHARED;
 
        /* General socket configuration */
        link->conf.Attributes    = CONF_ENABLE_IRQ;