This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / scsi / scsi_scan.c

diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 166cb9a..1f006bf 100644 (file)
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -32,13 +32,11 @@
 #include <linux/blkdev.h>
 #include <asm/semaphore.h>
 
-#include <scsi/scsi.h>
-#include <scsi/scsi_device.h>
 #include <scsi/scsi_driver.h>
 #include <scsi/scsi_devinfo.h>
 #include <scsi/scsi_host.h>
-#include <scsi/scsi_request.h>
 #include <scsi/scsi_transport.h>
+#include "scsi.h"
 
 #include "scsi_priv.h"
 #include "scsi_logging.h"
@@ -663,9 +661,6 @@ static int scsi_add_lun(struct scsi_device *sdev, char *inq_result, int *bflags)
        if (*bflags & BLIST_MS_192_BYTES_FOR_3F)
                sdev->use_192_bytes_for_3f = 1;
 
-       if (*bflags & BLIST_NOT_LOCKABLE)
-               sdev->lockable = 0;
-
        if(sdev->host->hostt->slave_configure)
                sdev->host->hostt->slave_configure(sdev);