summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2003-07-25 19:14:05 -0700
committerJens Axboe <axboe@suse.de>2003-07-25 19:14:05 -0700
commit8b551fcc13136605680851833fcda7410e27d89e (patch)
tree237ee7595acc0d5a04e51a647831de5493ec8b52
parent01b9e994b08a3f65181cfcfea40b5a83001e8048 (diff)
[PATCH] M68k floppy warnings
M68k floppy: Kill warnings when compiling a multi-platform kernel
-rw-r--r--include/asm-m68k/floppy.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/asm-m68k/floppy.h b/include/asm-m68k/floppy.h
index 1a9bb3b97a4f..73f67e4e2b47 100644
--- 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)