diff options
author | Alan <alan@lxorguk.ukuu.org.uk> | 2007-02-16 04:40:04 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-02-21 04:58:17 -0500 |
commit | 4bb64fb98168981d3e5a0e790c077ff511768e84 (patch) | |
tree | 0eb8abc40dc6777fb9ee0b98ae988904c2127b6b /drivers/ata/libata.h | |
parent | 2b06719153089aa8f5ac577f15f8aa8e5b5fe357 (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/ata/libata.h')
-rw-r--r-- | drivers/ata/libata.h | 2 |
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); | |||
159 | /* libata-sff.c */ | 159 | /* libata-sff.c */ |
160 | extern u8 ata_irq_on(struct ata_port *ap); | 160 | extern u8 ata_irq_on(struct ata_port *ap); |
161 | 161 | ||
162 | /* pata_sis.c */ | ||
163 | extern struct ata_port_info sis_info133; | ||
164 | 162 | ||
165 | #endif /* __LIBATA_H__ */ | 163 | #endif /* __LIBATA_H__ */ |