diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/ata/libata.h | 3 | ||||
-rw-r--r-- | drivers/ata/pata_sis.c | 3 | ||||
-rw-r--r-- | drivers/ata/sata_sis.c | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h index 81ae41d5f23f..94eeb3d3c674 100644 --- a/drivers/ata/libata.h +++ b/drivers/ata/libata.h | |||
@@ -136,4 +136,7 @@ extern void ata_qc_schedule_eh(struct ata_queued_cmd *qc); | |||
136 | /* libata-sff.c */ | 136 | /* libata-sff.c */ |
137 | extern u8 ata_irq_on(struct ata_port *ap); | 137 | extern u8 ata_irq_on(struct ata_port *ap); |
138 | 138 | ||
139 | /* pata_sis.c */ | ||
140 | extern struct ata_port_info sis_info133; | ||
141 | |||
139 | #endif /* __LIBATA_H__ */ | 142 | #endif /* __LIBATA_H__ */ |
diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c index 6746f3fb0876..5e616d3cc870 100644 --- a/drivers/ata/pata_sis.c +++ b/drivers/ata/pata_sis.c | |||
@@ -32,6 +32,7 @@ | |||
32 | #include <scsi/scsi_host.h> | 32 | #include <scsi/scsi_host.h> |
33 | #include <linux/libata.h> | 33 | #include <linux/libata.h> |
34 | #include <linux/ata.h> | 34 | #include <linux/ata.h> |
35 | #include "libata.h" | ||
35 | 36 | ||
36 | #define DRV_NAME "pata_sis" | 37 | #define DRV_NAME "pata_sis" |
37 | #define DRV_VERSION "0.4.5" | 38 | #define DRV_VERSION "0.4.5" |
@@ -781,7 +782,7 @@ static struct ata_port_info sis_info100_early = { | |||
781 | .pio_mask = 0x1f, /* pio0-4 */ | 782 | .pio_mask = 0x1f, /* pio0-4 */ |
782 | .port_ops = &sis_66_ops, | 783 | .port_ops = &sis_66_ops, |
783 | }; | 784 | }; |
784 | static struct ata_port_info sis_info133 = { | 785 | struct ata_port_info sis_info133 = { |
785 | .sht = &sis_sht, | 786 | .sht = &sis_sht, |
786 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST, | 787 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST, |
787 | .pio_mask = 0x1f, /* pio0-4 */ | 788 | .pio_mask = 0x1f, /* pio0-4 */ |
diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c index a915822ae63c..af6f42578f59 100644 --- a/drivers/ata/sata_sis.c +++ b/drivers/ata/sata_sis.c | |||
@@ -40,6 +40,7 @@ | |||
40 | #include <linux/device.h> | 40 | #include <linux/device.h> |
41 | #include <scsi/scsi_host.h> | 41 | #include <scsi/scsi_host.h> |
42 | #include <linux/libata.h> | 42 | #include <linux/libata.h> |
43 | #include "libata.h" | ||
43 | 44 | ||
44 | #define DRV_NAME "sata_sis" | 45 | #define DRV_NAME "sata_sis" |
45 | #define DRV_VERSION "0.7" | 46 | #define DRV_VERSION "0.7" |
@@ -254,9 +255,6 @@ static void sis_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val) | |||
254 | 255 | ||
255 | static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) | 256 | static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) |
256 | { | 257 | { |
257 | /* Provided by the PATA driver */ | ||
258 | extern struct ata_port_info sis_info133; | ||
259 | |||
260 | static int printed_version; | 258 | static int printed_version; |
261 | struct ata_probe_ent *probe_ent = NULL; | 259 | struct ata_probe_ent *probe_ent = NULL; |
262 | int rc; | 260 | int rc; |