aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAlan <alan@lxorguk.ukuu.org.uk>2007-02-16 04:40:04 -0500
committerJeff Garzik <jeff@garzik.org>2007-02-21 04:58:17 -0500
commit4bb64fb98168981d3e5a0e790c077ff511768e84 (patch)
tree0eb8abc40dc6777fb9ee0b98ae988904c2127b6b /drivers
parent2b06719153089aa8f5ac577f15f8aa8e5b5fe357 (diff)
SiS warning fixes
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ata/libata.h2
-rw-r--r--drivers/ata/pata_sis.c3
-rw-r--r--drivers/ata/sata_sis.c3
-rw-r--r--drivers/ata/sis.h5
4 files changed, 7 insertions, 6 deletions
diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
index 29bd7f80fc40..c42671493e8c 100644
--- a/drivers/ata/libata.h
+++ b/drivers/ata/libata.h
@@ -159,7 +159,5 @@ extern void ata_qc_schedule_eh(struct ata_queued_cmd *qc);
159/* libata-sff.c */ 159/* libata-sff.c */
160extern u8 ata_irq_on(struct ata_port *ap); 160extern u8 ata_irq_on(struct ata_port *ap);
161 161
162/* pata_sis.c */
163extern struct ata_port_info sis_info133;
164 162
165#endif /* __LIBATA_H__ */ 163#endif /* __LIBATA_H__ */
diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c
index 560103d55b2e..0a17a95e0504 100644
--- a/drivers/ata/pata_sis.c
+++ b/drivers/ata/pata_sis.c
@@ -32,9 +32,8 @@
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#include "sis.h"
36 36
37#undef DRV_NAME /* already defined in libata.h, for libata-core */
38#define DRV_NAME "pata_sis" 37#define DRV_NAME "pata_sis"
39#define DRV_VERSION "0.4.5" 38#define DRV_VERSION "0.4.5"
40 39
diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c
index 49c9e2bd706f..fd694b6a6f8a 100644
--- a/drivers/ata/sata_sis.c
+++ b/drivers/ata/sata_sis.c
@@ -40,9 +40,8 @@
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#include "sis.h"
44 44
45#undef DRV_NAME /* already defined in libata.h, for libata-core */
46#define DRV_NAME "sata_sis" 45#define DRV_NAME "sata_sis"
47#define DRV_VERSION "0.7" 46#define DRV_VERSION "0.7"
48 47
diff --git a/drivers/ata/sis.h b/drivers/ata/sis.h
new file mode 100644
index 000000000000..231da8fc2200
--- /dev/null
+++ b/drivers/ata/sis.h
@@ -0,0 +1,5 @@
1
2struct ata_port_info;
3
4/* pata_sis.c */
5extern struct ata_port_info sis_info133;