patch-2.4.14 linux/include/asm-m68k/floppy.h

• Lines: 34
• Date: Thu Oct 25 13:53:55 2001
• Orig file: v2.4.13/linux/include/asm-m68k/floppy.h
• Orig date: Tue Jul 3 17:08:21 2001

diff -u --recursive --new-file v2.4.13/linux/include/asm-m68k/floppy.h linux/include/asm-m68k/floppy.h
@@ -36,8 +36,6 @@
 
 /* basically PC init + set use_virtual_dma */
 #define  FDC1 m68k_floppy_init()
-static int FDC2 = -1;
-
 
 #define N_FDC 1
 #define N_DRIVE 8
@@ -89,7 +87,7 @@
 {
 	if(MACH_IS_Q40)
 		return request_irq(FLOPPY_IRQ, floppy_hardint,SA_INTERRUPT,
-						   "floppy", NULL);
+						   "floppy", floppy_hardint);
 	else if(MACH_IS_SUN3X) 
 		return sun3xflop_request_irq();
 	
@@ -98,7 +96,7 @@
 static void fd_free_irq(void)
 {
 	if(MACH_IS_Q40)
-		free_irq(FLOPPY_IRQ, NULL);
+		free_irq(FLOPPY_IRQ, floppy_hardint);
 }
 
 #define fd_request_dma()        vdma_request_dma(FLOPPY_DMA,"floppy")
@@ -254,5 +252,4 @@
 #endif
 }
 
-
-
+#define EXTRA_FLOPPY_PARAMS