SiS warning fixes
authorAlan <alan@lxorguk.ukuu.org.uk>
Fri, 16 Feb 2007 09:40:04 +0000 (01:40 -0800)
committerJeff Garzik <jeff@garzik.org>
Wed, 21 Feb 2007 09:58:17 +0000 (04:58 -0500)
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>
drivers/ata/libata.h
drivers/ata/pata_sis.c
drivers/ata/sata_sis.c
drivers/ata/sis.h [new file with mode: 0644]

index 29bd7f80fc40da4c1227da2e9ef739529f4b6c8a..c42671493e8c4bf035d141b3d69b3e3702453ede 100644 (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__ */
index 560103d55b2e9a09e784ea6882fc0d0fc5e7149a..0a17a95e05044862331a639c69ae44dd24fc04b4 100644 (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"
 
index 49c9e2bd706f9ad1f9367f78d481c1fb8139f668..fd694b6a6f8abaa18e3666c5b4ae4a3f5d185d18 100644 (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"
 
diff --git a/drivers/ata/sis.h b/drivers/ata/sis.h
new file mode 100644 (file)
index 0000000..231da8f
--- /dev/null
@@ -0,0 +1,5 @@
+
+struct ata_port_info;
+
+/* pata_sis.c */
+extern struct ata_port_info sis_info133;