patch-1.3.39 linux/drivers/scsi/sd.c

Next file: linux/drivers/scsi/sg.c
Previous file: linux/drivers/scsi/scsi_syms.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.38/linux/drivers/scsi/sd.c linux/drivers/scsi/sd.c
@@ -16,10 +16,8 @@
  *       low-level scsi drivers.
  */
 
-#ifdef MODULE
-#include <linux/autoconf.h>
 #include <linux/module.h>
-#include <linux/version.h>
+#ifdef MODULE
 /*
  * This is a variable in scsi.c that is set when we are processing something
  * after boot time.  By definition, this is true when we are a loadable module
@@ -1462,10 +1460,6 @@
 }
 
 #ifdef MODULE
-#include <linux/module.h>
-#include <linux/version.h>
-
-char kernel_version[] = UTS_RELEASE;
 
 int init_module(void) {
     sd_template.usage_count = &mod_use_count_;
@@ -1477,10 +1471,6 @@
     struct gendisk * prev_sdgd;
     struct gendisk * sdgd;
     
-    if (MOD_IN_USE) {
-	printk(KERN_INFO __FILE__ ": module is in use, remove rejected\n");
-	return;
-    }
     scsi_unregister_module(MODULE_SCSI_DEV, &sd_template);
     unregister_blkdev(SCSI_DISK_MAJOR, "sd");
     sd_registered--;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this