From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Marcelo Tosatti <marcelo@conectiva.com.br>,
"Andre M. Hedrick" <andre@linux-ide.org>
Cc: Linux Kernel Development <linux-kernel@vger.kernel.org>
Subject: 2.4.19-rc2 and !CONFIG_BLK_DEV_IDEPCI
Date: Wed, 17 Jul 2002 15:30:31 +0200 (MEST) [thread overview]
Message-ID: <Pine.GSO.4.21.0207171458420.16979-100000@vervain.sonytel.be> (raw)
Hi,
I need the following patch to compile 2.4.19-rc2 for m68k because struct hwif_s
contains no pci_devid field if CONFIG_BLK_DEV_IDEPCI is not defined.
--- linux-2.4.19-rc2/drivers/ide/ide-features.c Wed Jul 17 15:03:10 2002
+++ linux-m68k-2.4.19-rc2/drivers/ide/ide-features.c Wed Jul 17 15:12:28 2002
@@ -245,8 +245,10 @@
*/
byte eighty_ninty_three (ide_drive_t *drive)
{
+#ifdef CONFIG_BLK_DEV_IDEPCI
if (HWIF(drive)->pci_devid.vid==0x105a)
return(HWIF(drive)->udma_four);
+#endif
/* PDC202XX: that's because some HDD will return wrong info */
return ((byte) ((HWIF(drive)->udma_four) &&
#ifndef CONFIG_IDEDMA_IVB
Or perhaps all eighty_ninty_three() stuff should be protected by #ifdef
CONFIG_BLK_DEV_IDEDMA? That seems to work as well (alternative patch below)...
--- linux-2.4.19-rc2/drivers/ide/ide-features.c Wed Jul 17 09:53:15 2002
+++ linux-m68k-2.4.19-rc2/drivers/ide/ide-features.c Wed Jul 17 13:06:52 2002
@@ -240,6 +240,7 @@
return 0;
}
+#ifdef CONFIG_BLK_DEV_IDEDMA
/*
* All hosts that use the 80c ribbon mus use!
*/
@@ -254,6 +255,7 @@
#endif /* CONFIG_IDEDMA_IVB */
(drive->id->hw_config & 0x6000)) ? 1 : 0);
}
+#endif // CONFIG_BLK_DEV_IDEDMA
/*
* Similar to ide_wait_stat(), except it never calls ide_error internally.
@@ -374,6 +376,8 @@
EXPORT_SYMBOL(ide_driveid_update);
EXPORT_SYMBOL(ide_ata66_check);
EXPORT_SYMBOL(set_transfer);
+#ifdef CONFIG_BLK_DEV_IDEDMA
EXPORT_SYMBOL(eighty_ninty_three);
+#endif // CONFIG_BLK_DEV_IDEDMA
EXPORT_SYMBOL(ide_config_drive_speed);
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
next reply other threads:[~2002-07-17 13:28 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-07-17 13:30 Geert Uytterhoeven [this message]
2002-07-17 14:42 ` 2.4.19-rc2 and !CONFIG_BLK_DEV_IDEPCI James Mayer
2002-07-17 16:48 ` Andre Hedrick
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=Pine.GSO.4.21.0207171458420.16979-100000@vervain.sonytel.be \
--to=geert@linux-m68k.org \
--cc=andre@linux-ide.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marcelo@conectiva.com.br \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).