[IDE] au1xxx_ide.h: Remove redefinition of drive_list_entry
The mips tree (but not mainline) contains a definition of
drive_list_entry in include/asm-mips/mach-au1x00/au1xxx_ide.h which
leads to a compilation failure if CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
is set. Remove this bogus redefinition, thereby bringing the driver
in sync with mainline and into a compilable form.
CC drivers/ide/mips/au1xxx-ide.o
In file included from drivers/ide/mips/au1xxx-ide.c:53:
include/asm/mach-au1x00/au1xxx_ide.h:87: error: redefinition of ‘struct
drive_list_entry’
Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
--- mips.git/include/asm-mips/mach-au1x00/au1xxx_ide.h 2006-02-23
22:06:13.000000000 +0000
+++ linux-2.6.git/include/asm-mips/mach-au1x00/au1xxx_ide.h 2006-02-03
03:07:30.000000000 +0000
@@ -84,11 +84,6 @@
} _auide_hwif;
#ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
-struct drive_list_entry {
- const char *id_model;
- const char *id_firmware;
-};
-
/* HD white list */
static const struct drive_list_entry dma_white_list [] = {
/*
--
Martin Michlmayr
http://www.cyrius.com/
|