patch-2.4.0-test3 linux/drivers/scsi/scsi.c

• Lines: 35
• Date: Sun Jul 9 22:14:37 2000
• Orig file: v2.4.0-test2/linux/drivers/scsi/scsi.c
• Orig date: Fri Jun 23 21:55:10 2000

diff -u --recursive --new-file v2.4.0-test2/linux/drivers/scsi/scsi.c linux/drivers/scsi/scsi.c
@@ -136,7 +136,6 @@
  */
 extern void scsi_times_out(Scsi_Cmnd * SCpnt);
 void scsi_build_commandblocks(Scsi_Device * SDpnt);
-static int scsi_unregister_device(struct Scsi_Device_Template *tpnt);
 
 /*
  * These are the interface to the old error handling code.  It should go away
@@ -1529,7 +1528,7 @@
 
 	/* Yes we're here... */
 
-        scsi_devfs_handle = devfs_mk_dir (NULL, "scsi", 4, NULL);
+        scsi_devfs_handle = devfs_mk_dir (NULL, "scsi", NULL);
 	/*
 	 * This makes /proc/scsi and /proc/scsi/scsi visible.
 	 */
@@ -2293,6 +2292,8 @@
 	MOD_DEC_USE_COUNT;
 }
 
+static int scsi_unregister_device(struct Scsi_Device_Template *tpnt);
+
 /*
  * This entry point should be called by a loadable module if it is trying
  * add a high level scsi driver to the system.
@@ -2646,7 +2647,7 @@
 
 	scsi_loadable_module_flag = 1;
 
-        scsi_devfs_handle = devfs_mk_dir (NULL, "scsi", 4, NULL);
+        scsi_devfs_handle = devfs_mk_dir (NULL, "scsi", NULL);
         scsi_host_no_init (scsihosts);
 	/*
 	 * This is where the processing takes place for most everything