diff options
Diffstat (limited to 'drivers/ata/pata_marvell.c')
-rw-r--r-- | drivers/ata/pata_marvell.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c index 286310fc5910..d8da4f344c0a 100644 --- a/drivers/ata/pata_marvell.c +++ b/drivers/ata/pata_marvell.c | |||
@@ -119,7 +119,6 @@ static struct ata_port_operations marvell_ops = { | |||
119 | static int marvell_init_one (struct pci_dev *pdev, const struct pci_device_id *id) | 119 | static int marvell_init_one (struct pci_dev *pdev, const struct pci_device_id *id) |
120 | { | 120 | { |
121 | static const struct ata_port_info info = { | 121 | static const struct ata_port_info info = { |
122 | .sht = &marvell_sht, | ||
123 | .flags = ATA_FLAG_SLAVE_POSS, | 122 | .flags = ATA_FLAG_SLAVE_POSS, |
124 | 123 | ||
125 | .pio_mask = 0x1f, | 124 | .pio_mask = 0x1f, |
@@ -129,7 +128,6 @@ static int marvell_init_one (struct pci_dev *pdev, const struct pci_device_id *i | |||
129 | .port_ops = &marvell_ops, | 128 | .port_ops = &marvell_ops, |
130 | }; | 129 | }; |
131 | static const struct ata_port_info info_sata = { | 130 | static const struct ata_port_info info_sata = { |
132 | .sht = &marvell_sht, | ||
133 | /* Slave possible as its magically mapped not real */ | 131 | /* Slave possible as its magically mapped not real */ |
134 | .flags = ATA_FLAG_SLAVE_POSS, | 132 | .flags = ATA_FLAG_SLAVE_POSS, |
135 | 133 | ||
@@ -144,7 +142,7 @@ static int marvell_init_one (struct pci_dev *pdev, const struct pci_device_id *i | |||
144 | if (pdev->device == 0x6101) | 142 | if (pdev->device == 0x6101) |
145 | ppi[1] = &ata_dummy_port_info; | 143 | ppi[1] = &ata_dummy_port_info; |
146 | 144 | ||
147 | return ata_pci_init_one(pdev, ppi); | 145 | return ata_pci_init_one(pdev, ppi, &marvell_sht); |
148 | } | 146 | } |
149 | 147 | ||
150 | static const struct pci_device_id marvell_pci_tbl[] = { | 148 | static const struct pci_device_id marvell_pci_tbl[] = { |