Merge by hand (conflicts in scsi_lib.c)

[karo-tx-linux.git] / drivers / scsi / sr.c

diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index fb4012b5c1884b8117a0b2155dd634879352acd7..7e7398d563cc3e80e6972719e4ee5f44d5fa45a6 100644 (file)
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -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",