diff -urN 2.2.18pre21/drivers/scsi/Makefile export/drivers/scsi/Makefile
--- 2.2.18pre21/drivers/scsi/Makefile	Sun Nov 12 00:45:38 2000
+++ export/drivers/scsi/Makefile	Tue Nov 14 15:43:18 2000
@@ -62,10 +62,12 @@
 endif
 
 ifeq ($(CONFIG_BLK_DEV_SD),y)
-L_OBJS += sd.o sd_ioctl.o
+L_OBJS += sd_ioctl.o
+LX_OBJS += sd.o
 else
   ifeq ($(CONFIG_BLK_DEV_SD),m)
   M_OBJS += sd_mod.o
+  MIX_OBJS += sd.o
   endif
 endif
 
@@ -729,9 +731,9 @@
 megaraid.o: megaraid.c
 	$(CC) $(CFLAGS) -c megaraid.c
 
-scsi_mod.o: $(MIX_OBJS) hosts.o scsi.o scsi_ioctl.o constants.o \
+scsi_mod.o: $(MIX_OBJS:%sd.o=%) hosts.o scsi.o scsi_ioctl.o constants.o \
 		scsicam.o scsi_proc.o scsi_error.o scsi_obsolete.o scsi_queue.o
-	$(LD) $(LD_RFLAG) -r -o $@ $(MIX_OBJS) hosts.o scsi.o scsi_ioctl.o \
+	$(LD) $(LD_RFLAG) -r -o $@ $(MIX_OBJS:%sd.o=%) hosts.o scsi.o scsi_ioctl.o \
 		constants.o scsicam.o scsi_proc.o               \
 		scsi_error.o scsi_obsolete.o scsi_queue.o \
 
diff -urN 2.2.18pre21/drivers/scsi/sd.c export/drivers/scsi/sd.c
--- 2.2.18pre21/drivers/scsi/sd.c	Sun Nov 12 00:45:40 2000
+++ export/drivers/scsi/sd.c	Tue Nov 14 15:43:06 2000
@@ -83,6 +83,7 @@
 struct hd_struct * sd;
 
 Scsi_Disk * rscsi_disks = NULL;
+EXPORT_SYMBOL(rscsi_disks);
 static int * sd_sizes;
 static int * sd_blocksizes;
 static int * sd_hardsizes;              /* Hardware sector size */