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

Next file: linux/drivers/block/hd.c
Previous file: linux/drivers/block/acsi_slm.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.22/linux/drivers/block/floppy.c linux/drivers/block/floppy.c
@@ -3704,7 +3704,7 @@
 	floppy_read,		/* read - general block-dev read */
 	floppy_write,		/* write - general block-dev write */
 	NULL,		       	/* readdir - bad */
-	NULL,			/* select */
+	NULL,			/* poll */
 	fd_ioctl,		/* ioctl */
 	NULL,			/* mmap */
 	floppy_open,		/* open */
@@ -4128,6 +4128,7 @@
 extern char *get_options(char *str, int *ints);
 
 char *floppy=NULL;
+MODULE_PARM(floppy, "s");
 
 static void parse_floppy_cfg_string(char *cfg)
 {

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov