From: Martin Michlmayr <tbm@cyrius.com>
To: Ralf Baechle <ralf@linux-mips.org>, linux-mips@linux-mips.org
Cc: Jordan Crouse <jordan.crouse@amd.com>
Subject: Re: Diff between Linus' and linux-mips git: trivial changes
Date: Mon, 27 Feb 2006 22:34:01 +0000 [thread overview]
Message-ID: <20060227223401.GA7986@deprecation.cyrius.com> (raw)
In-Reply-To: <20060219234757.GW10266@deprecation.cyrius.com>
[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/
next prev parent reply other threads:[~2006-02-27 22:26 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-02-19 23:43 Diff between Linus' and linux-mips git: drivers! Martin Michlmayr
2006-02-19 23:47 ` Diff between Linus' and linux-mips git: trivial changes Martin Michlmayr
2006-02-20 13:33 ` Maciej W. Rozycki
2006-02-20 14:11 ` Ralf Baechle
2006-02-20 14:16 ` Martin Michlmayr
2006-02-20 14:16 ` Martin Michlmayr
2006-02-20 14:18 ` Martin Michlmayr
2006-02-20 14:28 ` Martin Michlmayr
2006-02-20 16:58 ` Maciej W. Rozycki
2006-02-20 18:09 ` Martin Michlmayr
2006-02-27 22:34 ` Martin Michlmayr [this message]
2006-02-28 21:10 ` Jordan Crouse
2006-02-20 0:01 ` Diff between Linus' and linux-mips git: small changes Martin Michlmayr
2006-02-20 0:11 ` Diff between Linus' and linux-mips git: VR4181 Martin Michlmayr
2006-02-20 0:31 ` Diff between Linus' and linux-mips git: elf.h Martin Michlmayr
2006-02-20 11:34 ` Ralf Baechle
2006-04-07 17:19 ` Martin Michlmayr
2006-04-07 17:47 ` Kevin D. Kissell
2006-04-07 17:47 ` Kevin D. Kissell
2006-04-07 22:21 ` Ralf Baechle
2006-04-10 12:27 ` Thiemo Seufer
2006-04-10 15:43 ` Ralf Baechle
2006-02-20 1:07 ` Diff between Linus' and linux-mips git: VR4181 Yoichi Yuasa
2006-02-20 1:21 ` Martin Michlmayr
2006-02-20 1:32 ` Yoichi Yuasa
2006-02-20 1:41 ` Martin Michlmayr
2006-02-20 1:50 ` Yoichi Yuasa
2006-02-20 0:17 ` Diff between Linus' and linux-mips git: declance Martin Michlmayr
2006-02-20 14:22 ` Martin Michlmayr
2006-02-20 17:02 ` Maciej W. Rozycki
2006-02-20 0:19 ` Diff between Linus' and linux-mips git: tulip Martin Michlmayr
2006-02-20 23:03 ` Peter Horton
2006-02-24 1:13 ` Martin Michlmayr
2006-02-24 1:49 ` Martin Michlmayr
2006-02-27 18:12 ` Ralf Baechle
2006-03-01 21:53 ` Peter Horton
2006-02-27 19:07 ` Diff between Linus' and linux-mips git: small changes Martin Michlmayr
2006-02-28 20:22 ` Dmitry Torokhov
2006-02-20 0:34 ` Diff between Linus' and linux-mips git: drivers! Martin Michlmayr
2006-02-27 19:10 ` Martin Michlmayr
2006-02-28 4:47 ` Yoichi Yuasa
2006-02-28 9:51 ` Martin Michlmayr
2006-02-20 15:27 ` Jordan Crouse
2006-02-20 15:27 ` Martin Michlmayr
2006-02-20 15:52 ` Christoph Hellwig
2006-02-20 16:46 ` Ralf Baechle
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=20060227223401.GA7986@deprecation.cyrius.com \
--to=tbm@cyrius.com \
--cc=jordan.crouse@amd.com \
--cc=linux-mips@linux-mips.org \
--cc=ralf@linux-mips.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.