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
Signed-off-by: Alan Cox <[email protected]>
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.20-rc6-mm3/drivers/ata/libata.h linux-2.6.20-rc6-mm3/drivers/ata/libata.h
--- linux.vanilla-2.6.20-rc6-mm3/drivers/ata/libata.h 2007-01-31 14:20:39.000000000 +0000
+++ linux-2.6.20-rc6-mm3/drivers/ata/libata.h 2007-01-31 15:04:24.000000000 +0000
@@ -151,7 +151,5 @@
/* 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 -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.20-rc6-mm3/drivers/ata/pata_sis.c linux-2.6.20-rc6-mm3/drivers/ata/pata_sis.c
--- linux.vanilla-2.6.20-rc6-mm3/drivers/ata/pata_sis.c 2007-01-31 14:20:39.000000000 +0000
+++ linux-2.6.20-rc6-mm3/drivers/ata/pata_sis.c 2007-01-31 15:05:42.000000000 +0000
@@ -32,7 +32,6 @@
#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"
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.20-rc6-mm3/drivers/ata/sata_sis.c linux-2.6.20-rc6-mm3/drivers/ata/sata_sis.c
--- linux.vanilla-2.6.20-rc6-mm3/drivers/ata/sata_sis.c 2007-01-31 14:20:39.000000000 +0000
+++ linux-2.6.20-rc6-mm3/drivers/ata/sata_sis.c 2007-01-31 15:04:23.000000000 +0000
@@ -40,11 +40,13 @@
#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"
+/* pata_sis.c */
+extern struct ata_port_info sis_info133;
+
enum {
sis_180 = 0,
SIS_SCR_PCI_BAR = 5,
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
