[PATCH] M68k floppy warnings

From: Geert Uytterhoeven (geert@linux-m68k.org)
Date: Sat Jul 26 2003 - 09:51:38 EST

M68k floppy: Kill warnings when compiling a multi-platform kernel

--- linux-2.6.x/include/asm-m68k/floppy.h Sat Mar 2 15:09:54 2002
+++ linux-m68k-2.6.x/include/asm-m68k/floppy.h Fri Jun 6 18:49:51 2003
@@ -72,6 +72,7 @@
                 return inb_p(port);
         else if(MACH_IS_SUN3X)
                 return sun3x_82072_fd_inb(port);
+ return 0;
 }
 
 static __inline__ void fd_outb(unsigned char value, int port)
@@ -88,9 +89,9 @@
         if(MACH_IS_Q40)
                 return request_irq(FLOPPY_IRQ, floppy_hardint,SA_INTERRUPT,
                                                    "floppy", floppy_hardint);
- else if(MACH_IS_SUN3X)
+ else if(MACH_IS_SUN3X)
                 return sun3xflop_request_irq();
-
+ return -ENXIO;
 }
 
 static void fd_free_irq(void)

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
-
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 : Thu Jul 31 2003 - 22:00:29 EST