patch-pre2.0.14-final2.0 linux/drivers/scsi/scsi.c

• Lines: 48
• Date: Fri Jun 7 11:46:54 1996
• Orig file: pre2.0.14/linux/drivers/scsi/scsi.c
• Orig date: Mon Jun 3 16:46:56 1996

diff -u --recursive --new-file pre2.0.14/linux/drivers/scsi/scsi.c linux/drivers/scsi/scsi.c
@@ -151,6 +151,7 @@
 /* This is the pointer to the /proc/scsi code. 
  * It is only initialized to !=0 if the scsi code is present 
  */ 
+#if CONFIG_PROC_FS 
 extern int (* dispatch_scsi_info_ptr)(int ino, char *buffer, char **start, 
 				      off_t offset, int length, int inout); 
 extern int dispatch_scsi_info(int ino, char *buffer, char **start, 
@@ -163,6 +164,7 @@
     NULL, NULL,
     NULL, NULL, NULL
 };
+#endif
 
 /*
  *  As the scsi do command functions are intelligent, and may need to
@@ -2503,7 +2505,9 @@
 #endif
 
     /* Yes we're here... */
+#if CONFIG_PROC_FS 
     dispatch_scsi_info_ptr = dispatch_scsi_info;
+#endif
 
     /* Init a few things so we can "malloc" memory. */
     scsi_loadable_module_flag = 0;
@@ -3391,7 +3395,9 @@
     /*
      * This makes /proc/scsi visible.
      */
+#if CONFIG_PROC_FS
     dispatch_scsi_info_ptr = dispatch_scsi_info;
+#endif
 
     timer_table[SCSI_TIMER].fn = scsi_main_timeout;
     timer_table[SCSI_TIMER].expires = 0;
@@ -3428,10 +3434,10 @@
 {
 #if CONFIG_PROC_FS
     proc_scsi_unregister(0, PROC_SCSI_SCSI);
-#endif
 
     /* No, we're not here anymore. Don't show the /proc/scsi files. */
     dispatch_scsi_info_ptr = 0L;
+#endif
 
     /*
      * Free up the DMA pool.