diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-08-31 01:45:48 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-08-31 01:45:48 -0400 |
| commit | aa43f77939c97bf9d3580c6a5e71a5a40290e451 (patch) | |
| tree | 095c0b8b3da4b6554a3f8ef4b39240a5d9216d4d /drivers/scsi/sata_sil24.c | |
| parent | 2818c5dec5e28d65d52afbb7695bbbafe6377ee5 (diff) | |
| parent | 4c15343167b5febe7bb0ba96aad5bef42ae94d3b (diff) | |
Merge branch 'merge'
Diffstat (limited to 'drivers/scsi/sata_sil24.c')
| -rw-r--r-- | drivers/scsi/sata_sil24.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/sata_sil24.c b/drivers/scsi/sata_sil24.c index 2e0f4a4076af..3f368c7d3ef9 100644 --- a/drivers/scsi/sata_sil24.c +++ b/drivers/scsi/sata_sil24.c | |||
| @@ -1106,7 +1106,6 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 1106 | 1106 | ||
| 1107 | probe_ent->irq = pdev->irq; | 1107 | probe_ent->irq = pdev->irq; |
| 1108 | probe_ent->irq_flags = IRQF_SHARED; | 1108 | probe_ent->irq_flags = IRQF_SHARED; |
| 1109 | probe_ent->mmio_base = port_base; | ||
| 1110 | probe_ent->private_data = hpriv; | 1109 | probe_ent->private_data = hpriv; |
| 1111 | 1110 | ||
| 1112 | hpriv->host_base = host_base; | 1111 | hpriv->host_base = host_base; |