korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-02 16:44:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

SiS warning fixes

Browse Source 
Somehow the sis_info133 external definition ended up in libata.h and that
was included by both drivers.  However libata.h contains libata-* specific
internals and clashing defines like DRV_NAME so this makes a mess.  Move
the extern into the C file and remove the warnings

[akpm@linux-foundation.org: create sis.h to avoid extern-decl-in-C]
Signed-off-by: Alan Cox <alan@redhat.com>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Alan 2007-02-16 01:40:04 -08:00 committed by Jeff Garzik
parent 2b06719153
commit 4bb64fb981
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/ata/libata.h
View File

@ -159,7 +159,5 @@ 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__ */

3
drivers/ata/pata_sis.c
View File

@ -32,9 +32,8 @@
#include <scsi/scsi_host.h>
#include <linux/libata.h>
#include <linux/ata.h>
#include "libata.h"
#include "sis.h"
#undef DRV_NAME /* already defined in libata.h, for libata-core */
#define DRV_NAME "pata_sis"
#define DRV_VERSION "0.4.5"

3
drivers/ata/sata_sis.c
View File

@ -40,9 +40,8 @@
#include <linux/device.h>
#include <scsi/scsi_host.h>
#include <linux/libata.h>
#include "libata.h"
#include "sis.h"
#undef DRV_NAME /* already defined in libata.h, for libata-core */
#define DRV_NAME "sata_sis"
#define DRV_VERSION "0.7"

5
drivers/ata/sis.h Normal file
View File

@ -0,0 +1,5 @@
struct ata_port_info;
/* pata_sis.c */
extern struct ata_port_info sis_info133;