Merge branch 'pm-x86'

[linux-2.6-block.git] / drivers / scsi / 3w-xxxx.c

diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c
index a58257645e94b6473ac7b242c97b51de006d0da0..2b1e0d5030201c4bb4538d8d84569b17c99cde9d 100644 (file)
--- a/drivers/scsi/3w-xxxx.c
+++ b/drivers/scsi/3w-xxxx.c
@@ -1174,7 +1174,7 @@ static int tw_setfeature(TW_Device_Extension *tw_dev, int parm, int param_size,
        command_que_value = tw_dev->command_packet_physical_address[request_id];
        if (command_que_value == 0) {
                printk(KERN_WARNING "3w-xxxx: tw_setfeature(): Bad command packet physical address.\n");
-       return 1;
+               return 1;
        }
 
        /* Send command packet to the board */
@@ -2247,7 +2247,6 @@ static struct scsi_host_template driver_template = {
        .sg_tablesize           = TW_MAX_SGL_LENGTH,
        .max_sectors            = TW_MAX_SECTORS,
        .cmd_per_lun            = TW_MAX_CMDS_PER_LUN,  
-       .use_clustering         = ENABLE_CLUSTERING,
        .shost_attrs            = tw_host_attrs,
        .emulated               = 1,
        .no_write_same          = 1,