Merge branch 'tj-block-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-block.git] / drivers / scsi / mac53c94.c

diff --git a/drivers/scsi/mac53c94.c b/drivers/scsi/mac53c94.c
index a035001f44386a36e49abcd3d292fb31239cf85e..18735b39b3d39c8547e27b8037fbef033a0df76a 100644 (file)
--- a/drivers/scsi/mac53c94.c
+++ b/drivers/scsi/mac53c94.c
@@ -75,8 +75,9 @@ static int mac53c94_queue(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *
                int i;
                printk(KERN_DEBUG "mac53c94_queue %p: command is", cmd);
                for (i = 0; i < cmd->cmd_len; ++i)
-                       printk(" %.2x", cmd->cmnd[i]);
-               printk("\n" KERN_DEBUG "use_sg=%d request_bufflen=%d request_buffer=%p\n",
+                       printk(KERN_CONT " %.2x", cmd->cmnd[i]);
+               printk(KERN_CONT "\n");
+               printk(KERN_DEBUG "use_sg=%d request_bufflen=%d request_buffer=%p\n",
                       scsi_sg_count(cmd), scsi_bufflen(cmd), scsi_sglist(cmd));
        }
 #endif
@@ -402,7 +403,6 @@ static struct scsi_host_template mac53c94_template = {
        .sg_tablesize   = SG_ALL,
        .cmd_per_lun    = 1,
        .use_clustering = DISABLE_CLUSTERING,
-       .use_sg_chaining = ENABLE_SG_CHAINING,
 };
 
 static int mac53c94_probe(struct macio_dev *mdev, const struct of_device_id *match)