From: Alan <alan@lxorguk.ukuu.org.uk>
To: akpm@osdl.org, linux-kernel@vger.kernel.org, jeff@garzik.org
Subject: [PATCH]: SiS warning fixes
Date: Wed, 31 Jan 2007 17:37:46 +0000 [thread overview]
Message-ID: <20070131173746.4285ec68@localhost.localdomain> (raw)
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 <alan@redhat.com>
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,
reply other threads:[~2007-01-31 17:25 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070131173746.4285ec68@localhost.localdomain \
--to=alan@lxorguk.ukuu.org.uk \
--cc=akpm@osdl.org \
--cc=jeff@garzik.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.