patch-2.3.99-pre6 linux/drivers/block/floppy.c

Next file: linux/drivers/block/genhd.c
Previous file: linux/drivers/block/Config.in
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.99-pre5/linux/drivers/block/floppy.c linux/drivers/block/floppy.c
@@ -201,7 +201,7 @@
 static unsigned short virtual_dma_port=0x3f0;
 void floppy_interrupt(int irq, void *dev_id, struct pt_regs * regs);
 static int set_dor(int fdc, char mask, char data);
-static void register_devfs_entries (int drive);
+static void register_devfs_entries (int drive) __init;
 static devfs_handle_t devfs_handle = NULL;
 
 #define K_64	0x10000		/* 64KB */
@@ -3582,7 +3582,7 @@
 #undef IN
 }
 
-static void config_types(void)
+static void __init config_types(void)
 {
 	int first=1;
 	int drive;
@@ -3836,7 +3836,7 @@
 	revalidate:		floppy_revalidate,
 };
 
-static void register_devfs_entries (int drive)
+static void __init register_devfs_entries (int drive)
 {
     int base_minor, i;
     static char *table[] =
@@ -4075,8 +4075,8 @@
 		printk("\n");
 	} else
 		DPRINT("botched floppy option\n");
-	DPRINT("Read linux/drivers/block/README.fd\n");
-	return 1;
+	DPRINT("Read linux/Documentation/floppy.txt\n");
+	return 0;
 }
 
 static int have_no_fdc= -EIO;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)