I haven't heard anything so here's the patch again (and the other one had a
superfluous ampersand anyway). Without it you can't compile
drivers/block/floppy.c on sparc64. It applies cleanly on top of 2.6.0-test1
or the current bk.
--- linux-2.6.0-test1/include/asm-sparc64/floppy.h 2003-07-13 23:39:23.000000000 -0400
+++ linux-2.6.0-test1-mathieu/include/asm/floppy.h 2003-07-18 17:18:43.000000000 -0400
@@ -214,7 +214,7 @@
}
/* Our low-level entry point in arch/sparc/kernel/entry.S */
-extern void floppy_hardint(int irq, void *unused, struct pt_regs *regs);
+extern irqreturn_t floppy_hardint(int irq, void *unused, struct pt_regs *regs);
static int sun_fd_request_irq(void)
{
@@ -277,7 +277,7 @@
static struct sun_pci_dma_op sun_pci_dma_current = { -1U, 0, 0, NULL};
static struct sun_pci_dma_op sun_pci_dma_pending = { -1U, 0, 0, NULL};
-extern void floppy_interrupt(int irq, void *dev_id, struct pt_regs *regs);
+extern irqreturn_t floppy_interrupt(int irq, void *dev_id, struct pt_regs *regs);
static unsigned char sun_pci_fd_inb(unsigned long port)
{
--
Mathieu Chouquet-Stringer E-Mail : mchouque@online.fr
Never attribute to malice that which can be adequately
explained by stupidity.
-- Hanlon's Razor --
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Wed Jul 23 2003 - 22:00:35 EST