patch-1.3.92 linux/drivers/scsi/sd_ioctl.c

• Lines: 26
• Date: Sat Apr 20 13:15:47 1996
• Orig file: v1.3.91/linux/drivers/scsi/sd_ioctl.c
• Orig date: Sun Mar 24 20:07:00 1996

diff -u --recursive --new-file v1.3.91/linux/drivers/scsi/sd_ioctl.c linux/drivers/scsi/sd_ioctl.c
@@ -4,7 +4,6 @@
  * ioctl handling for SCSI disks
  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
@@ -45,15 +44,12 @@
 
 /* override with calculated, extended default, or driver values */
 
-#ifdef CONFIG_SCSI_AUTO_BIOSP
-        scsicam_bios_param(&rscsi_disks[MINOR(dev) >> 4],
-				    dev, &diskinfo[0]);
-#else
 	if(host->hostt->bios_param != NULL)
 	    host->hostt->bios_param(&rscsi_disks[MINOR(dev) >> 4],
 				    dev,
 				    &diskinfo[0]);
-#endif
+        else scsicam_bios_param(&rscsi_disks[MINOR(dev) >> 4],
+				dev, &diskinfo[0]);
 
 	put_user(diskinfo[0], &loc->heads);
 	put_user(diskinfo[1], &loc->sectors);