diff options
| author | Adrian Bunk <bunk@stusta.de> | 2007-01-30 00:59:17 -0800 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-09 17:39:34 -0500 |
| commit | 77a527eadb425b60db3f5f0aae6a4c51c38e35e5 (patch) | |
| tree | a6636031ac808b137b03a244e87db771e9eb3573 | |
| parent | 9b14dec5adf47287a2b52fc9fdedd6a0e245daca (diff) | |
| download | linux-3.10-77a527eadb425b60db3f5f0aae6a4c51c38e35e5.tar.gz linux-3.10-77a527eadb425b60db3f5f0aae6a4c51c38e35e5.tar.bz2 linux-3.10-77a527eadb425b60db3f5f0aae6a4c51c38e35e5.zip | |
fix CONFIG_SATA_SIS=y compile error
Static code shouldn't be used from other modules.
drivers/built-in.o: In function `sis_init_one':
sata_sis.c:(.text+0x7634cd): undefined reference to `sis_info133'
sata_sis.c:(.text+0x7634d6): undefined reference to `sis_info133'
While I was at it, I also moved the prototype of this struct to a header
file.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: Tejun Heo <htejun@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
| -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 81ae41d5f23..94eeb3d3c67 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); /* libata-sff.c */ extern u8 ata_irq_on(struct ata_port *ap); +/* pata_sis.c */ +extern struct ata_port_info sis_info133; + #endif /* __LIBATA_H__ */ diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c index 6746f3fb087..5e616d3cc87 100644 --- a/drivers/ata/pata_sis.c +++ b/drivers/ata/pata_sis.c @@ -32,6 +32,7 @@ #include <scsi/scsi_host.h> #include <linux/libata.h> #include <linux/ata.h> +#include "libata.h" #define DRV_NAME "pata_sis" #define DRV_VERSION "0.4.5" @@ -781,7 +782,7 @@ static struct ata_port_info sis_info100_early = { .pio_mask = 0x1f, /* pio0-4 */ .port_ops = &sis_66_ops, }; -static struct ata_port_info sis_info133 = { +struct ata_port_info sis_info133 = { .sht = &sis_sht, .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST, .pio_mask = 0x1f, /* pio0-4 */ diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c index a915822ae63..af6f42578f5 100644 --- a/drivers/ata/sata_sis.c +++ b/drivers/ata/sata_sis.c @@ -40,6 +40,7 @@ #include <linux/device.h> #include <scsi/scsi_host.h> #include <linux/libata.h> +#include "libata.h" #define DRV_NAME "sata_sis" #define DRV_VERSION "0.7" @@ -254,9 +255,6 @@ static void sis_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val) static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) { - /* Provided by the PATA driver */ - extern struct ata_port_info sis_info133; - static int printed_version; struct ata_probe_ent *probe_ent = NULL; int rc; |