[PATCH] M68k floppy warnings

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

diff --git a/include/asm-m68k/floppy.h b/include/asm-m68k/floppy.h
index 1a9bb3b97a4febdcb5f9d1e9f2912e5e6a86c99e..73f67e4e2b47ab5fcdee665a05f1347bd08c3380 100644 (file)
--- a/include/asm-m68k/floppy.h
+++ b/include/asm-m68k/floppy.h
@@ -72,6 +72,7 @@ static __inline__ unsigned char fd_inb(int port)
                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 @@ static int fd_request_irq(void)
        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)