Merge git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa

[linux-2.6-omap-h63xx.git] / drivers / scsi / sr_vendor.c

diff --git a/drivers/scsi/sr_vendor.c b/drivers/scsi/sr_vendor.c
index 78274dc91f5c74c0320702735856d90b4390968c..9dde8df2f5c9feccf5d3ae98daad805b37bcecd3 100644 (file)
--- a/drivers/scsi/sr_vendor.c
+++ b/drivers/scsi/sr_vendor.c
@@ -68,8 +68,8 @@ void sr_vendor_init(Scsi_CD *cd)
 #ifndef CONFIG_BLK_DEV_SR_VENDOR
        cd->vendor = VENDOR_SCSI3;
 #else
-       char *vendor = cd->device->vendor;
-       char *model = cd->device->model;
+       const char *vendor = cd->device->vendor;
+       const char *model = cd->device->model;
        
        /* default */
        cd->vendor = VENDOR_SCSI3;