diff -ur --exclude-from /home/axboe/cdrom/exclude /opt/kernel/linux-2.4.0-test8/drivers/scsi/sd.c linux/drivers/scsi/sd.c
--- /opt/kernel/linux-2.4.0-test8/drivers/scsi/sd.c	Mon Sep 11 02:49:27 2000
+++ linux/drivers/scsi/sd.c	Sat Sep  9 18:25:17 2000
@@ -1335,12 +1335,13 @@
 	return;
 }
 
-int init_sd(void)
+#ifdef MODULE
+int init_module(void)
 {
 	sd_template.module = THIS_MODULE;
 	return scsi_register_module(MODULE_SCSI_DEV, &sd_template);
 }
-void exit_sd(void)
+void cleanup_module(void)
 {
 	struct gendisk **prev_sdgd_link;
 	struct gendisk *sdgd;
@@ -1387,6 +1388,4 @@
 	if (sd_gendisks != &sd_gendisk)
 		kfree(sd_gendisks);
 }
-
-module_init(init_sd);
-module_exit(exit_sd);
+#endif
diff -ur --exclude-from /home/axboe/cdrom/exclude /opt/kernel/linux-2.4.0-test8/drivers/scsi/sr.c linux/drivers/scsi/sr.c
--- /opt/kernel/linux-2.4.0-test8/drivers/scsi/sr.c	Mon Sep 11 02:49:27 2000
+++ linux/drivers/scsi/sr.c	Sat Sep  9 18:24:31 2000
@@ -849,13 +849,14 @@
 	return;
 }
 
-int init_sr(void)
+#ifdef MODULE
+int init_module(void)
 {
 	sr_template.module = THIS_MODULE;
 	return scsi_register_module(MODULE_SCSI_DEV, &sr_template);
 }
 
-void exit_sr(void)
+void cleanup_module(void)
 {
 	scsi_unregister_module(MODULE_SCSI_DEV, &sr_template);
 	devfs_unregister_blkdev(MAJOR_NR, "sr");
@@ -878,6 +879,4 @@
 
 	sr_template.dev_max = 0;
 }
-
-module_init(init_sr);
-module_exit(exit_sr);
+#endif

--- /opt/kernel/linux-2.4.0-test8/drivers/scsi/sr.c	Mon Sep 11 02:49:27 2000
+++ drivers/scsi/sr.c	Sat Sep  9 18:24:31 2000
@@ -849,13 +849,14 @@
 	return;
 }
 
-int init_sr(void)
+#ifdef MODULE
+int init_module(void)
 {
 	sr_template.module = THIS_MODULE;
 	return scsi_register_module(MODULE_SCSI_DEV, &sr_template);
 }
 
-void exit_sr(void)
+void cleanup_module(void)
 {
 	scsi_unregister_module(MODULE_SCSI_DEV, &sr_template);
 	devfs_unregister_blkdev(MAJOR_NR, "sr");
@@ -878,6 +879,4 @@
 
 	sr_template.dev_max = 0;
 }
-
-module_init(init_sr);
-module_exit(exit_sr);
+#endif