Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77a527ea authored by Adrian Bunk's avatar Adrian Bunk Committed by Jeff Garzik
Browse files

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: default avatarAdrian Bunk <bunk@stusta.de>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: Tejun Heo <htejun@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 9b14dec5

drivers/ata/libata.h

+3 −0
Original line number Diff line number Diff line
@@ -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__ */

drivers/ata/pata_sis.c

+2 −1
Original line number Diff line number Diff line
@@ -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 */

drivers/ata/sata_sis.c

+1 −3
Original line number Diff line number Diff line
@@ -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;