Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index fb4012b5c188..a4d9be7c6874 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -320,7 +320,7 @@ static int sr_init_command(struct scsi_cmnd * SCpnt)
          * these are already setup, just copy cdb basically
          */
         if (SCpnt->request->flags & REQ_BLOCK_PC) {
-                scsi_setup_blk_pc_cmnd(SCpnt, MAX_RETRIES);
+                scsi_setup_blk_pc_cmnd(SCpnt);
 
                 if (SCpnt->timeout_per_command)
                         timeout = SCpnt->timeout_per_command;
@@ -716,7 +716,7 @@ static void get_capabilities(struct scsi_cd *cd)
         unsigned int the_result;
         int retries, rc, n;
 
-        static char *loadmech[] =
+        static const char *loadmech[] =
         {
                 "caddy",
                 "tray",