[patch] 2.2.14pre2 ide.c fails to compile

Petr Sebor (petr@scssoft.com)
Thu, 28 Oct 1999 10:43:38 +0200


I have discovered that /drivers/block/ide.c fails to compile in case
CONFIG_BLK_DEV_IDEPCI is not defined. This patch will take care
of it, however, somebody should look a bit closer into this since I
may be plainly wrong...

Regards,
Petr

diff -u -r drivers/block/ide.c.old drivers/block/ide.c
--- drivers/block/ide.c.old Thu Oct 28 10:30:14 1999
+++ drivers/block/ide.c Thu Oct 28 10:30:33 1999
@@ -1419,12 +1419,14 @@
*/

(void)ide_ack_intr(hwif->io_ports[IDE_STATUS_OFFSET],
hwif->io_ports[IDE_IRQ_OFFSET]);
unexpected_intr(irq, hwgroup);
+#ifdef CONFIG_BLK_DEV_IDEPCI
} else
{
/*
* Whack the status register, just in case we have a
leftover pending IRQ.
*/
(void)IN_BYTE(hwif->io_ports[IDE_STATUS_OFFSET]);
+#endif /* CONFIG_BLK_DEV_IDEPCI */
}
spin_unlock_irqrestore(&io_request_lock, flags);
return;

--
Petr Sebor
Technology/Engine Development
SCS Software [ http://www.scssoft.com ]

- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.rutgers.edu Please read the FAQ at http://www.tux.org/lkml/