diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-07-03 10:41:12 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-07-03 10:41:12 -0400 |
| commit | c4e00fac42f268ed0a547cdd1d12bb8399864040 (patch) | |
| tree | 1a54d87be2066c49b71a03764fcb4fc7f9c68c41 /drivers/scsi/pcmcia | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
| parent | d6b0c53723753fc0cfda63f56735b225c43e1e9a (diff) | |
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>
Diffstat (limited to 'drivers/scsi/pcmcia')
| -rw-r--r-- | drivers/scsi/pcmcia/nsp_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c index 7ff5851c040b..0d4c04e1f3de 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 |= (IRQF_SHARED | IRQF_SAMPLE_RANDOM); | 1626 | link->irq.Attributes |= IRQF_SHARED; |
| 1627 | 1627 | ||
| 1628 | /* General socket configuration */ | 1628 | /* General socket configuration */ |
| 1629 | link->conf.Attributes = CONF_ENABLE_IRQ; | 1629 | link->conf.Attributes = CONF_ENABLE_IRQ; |