summaryrefslogtreecommitdiff
path: root/drivers/ata/libata.h
diff options
context:
space:
mode:
authorAlan <alan@lxorguk.ukuu.org.uk>2007-02-16 12:40:04 +0300
committerJeff Garzik <jeff@garzik.org>2007-02-21 12:58:17 +0300
commit4bb64fb98168981d3e5a0e790c077ff511768e84 (patch)
tree0eb8abc40dc6777fb9ee0b98ae988904c2127b6b /drivers/ata/libata.h
parent2b06719153089aa8f5ac577f15f8aa8e5b5fe357 (diff)
downloadlinux-4bb64fb98168981d3e5a0e790c077ff511768e84.tar.xz
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/ata/libata.h')
-rw-r--r--drivers/ata/libata.h2
1 files changed, 0 insertions, 2 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);
/* 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__ */