Index: oldkernel/linux/drivers/scsi/scsicam.c
diff -u linux/drivers/scsi/scsicam.c:1.1.1.1 linux/drivers/scsi/scsicam.c:1.2
--- linux/drivers/scsi/scsicam.c:1.1.1.1	Wed May 31 12:33:51 2000
+++ linux/drivers/scsi/scsicam.c	Wed May 31 14:42:54 2000
@@ -44,7 +44,6 @@
     struct buffer_head *bh;
     int ret_code;
     int size = disk->capacity;
-    unsigned long temp_cyl;
 
     if (!(bh = bread(MKDEV(MAJOR(dev), MINOR(dev)&~0xf), 0, 1024)))
 	return -1;
@@ -65,13 +64,8 @@
     /* if something went wrong, then apparently we have to return
        a geometry with more than 1024 cylinders */
     if (ret_code || ip[0] > 255 || ip[1] > 63) {
-	 ip[0] = 64;
-	 ip[1] = 32;
-	 temp_cyl = size / (ip[0] * ip[1]);
-	 if (temp_cyl > 65534) {
-	      ip[0] = 255;
-	      ip[1] = 63;
-	 }
+	 ip[0] = 255;
+	 ip[1] = 63;
 	 ip[2] = size / (ip[0] * ip[1]);
     }