patch-1.3.39 linux/drivers/block/floppy.c

• Lines: 53
• Date: Thu Nov 9 08:24:03 1995
• Orig file: v1.3.38/linux/drivers/block/floppy.c
• Orig date: Wed Nov 8 07:11:30 1995

diff -u --recursive --new-file v1.3.38/linux/drivers/block/floppy.c linux/drivers/block/floppy.c
@@ -109,29 +109,14 @@
 
 #include <linux/module.h>
 
-#ifdef MODULE
-
-#define FD_MODULE
-
-int FLOPPY_IRQ=6;
-int FLOPPY_DMA=2;
-int ALLOWED_DRIVE_MASK = 0x33;
-
-#endif
-
-#ifndef FD_MODULE
 /* the following is the mask of allowed drives. By default units 2 and
  * 3 of both floppy controllers are disabled, because switching on the
  * motor of these drives causes system hangs on some PCI computers. drive
  * 0 is the low bit (0x1), and drive 7 is the high bit (0x80). Bits are on if
  * a drive is allowed. */
-static int ALLOWED_DRIVE_MASK=0x33;
-
-#define FLOPPY_IRQ 6
-#define FLOPPY_DMA 2
-#endif
-
-#define MODULE_AWARE_DRIVER
+static int FLOPPY_IRQ=6;
+static int FLOPPY_DMA=2;
+static int ALLOWED_DRIVE_MASK = 0x33;
 
 #include <linux/sched.h>
 #include <linux/fs.h>
@@ -3910,9 +3895,7 @@
 		return 0;
 	}
 	sti();
-#ifdef FD_MODULE
 	MOD_INC_USE_COUNT;
-#endif
 	for(i=0; i< N_FDC; i++){
 		if(FDCS->address != -1){
 			fdc = i;
@@ -3955,9 +3938,7 @@
 		return;
 	}
 	sti();
-#ifdef FD_MODULE
 	MOD_DEC_USE_COUNT;
-#endif
 	fd_disable_dma();
 	fd_free_dma();
 	fd_disable_irq();