Manual merge of minor syntax clash

diff --cc drivers/scsi/sd.c
index eb43730cd2c65253646bda56a647aa9dd37cad1e,c13815ebe1a0a9701e1df123df766d202a7f492f..cb53c15f8b5a1c58b4a41d5df5c1a3be5c1e51ed
--- 1/drivers/scsi/sd.c
--- 2/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@@ -1161,12 -1029,13 +1165,13 @@@ static int sd_init_onedisk(Scsi_Disk * 
                the_result = SRpnt->sr_result;
  
                if (the_result) {
-                       printk(KERN_NOTICE "%s: test WP failed, assume "
-                              "Write Enabled\n", nbuff);
+                       printk("%s: test WP failed, assume Write Enabled\n",
+                              nbuff);
+                       /* alternatively, try page 0 */
                } else {
 -                      rscsi_disks[i].write_prot = ((buffer[2] & 0x80) != 0);
 -                      printk("%s: Write Protect is %s\n", nbuff,
 -                             rscsi_disks[i].write_prot ? "on" : "off");
 +                      sdkp->write_prot = ((buffer[2] & 0x80) != 0);
 +                      printk(KERN_NOTICE "%s: Write Protect is %s\n", nbuff,
 +                             sdkp->write_prot ? "on" : "off");
                }
  
        }                       /* check for write protect */