diff options
| author | Jens Axboe <axboe@fb.com> | 2017-02-17 14:06:45 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-02-17 14:06:45 -0700 |
| commit | 6010720da8aab51f33beee63b73cf88016e9b250 (patch) | |
| tree | a4c5a7f645998e86a1f49cb05f8e0c4e51448294 /drivers/ide | |
| parent | 2fe1e8a7b2f4dcac3fcb07ff06b0ae7396201fd6 (diff) | |
| parent | 8a9ae523282f324989850fcf41312b42a2fb9296 (diff) | |
| download | linux-6010720da8aab51f33beee63b73cf88016e9b250.tar.gz linux-6010720da8aab51f33beee63b73cf88016e9b250.tar.bz2 linux-6010720da8aab51f33beee63b73cf88016e9b250.zip | |
Merge branch 'for-4.11/block' into for-4.11/linus-merge
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/ide')
| -rw-r--r-- | drivers/ide/ide-cd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index 9cbd217bc0c9..ab9232e1e16f 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c @@ -1166,7 +1166,7 @@ void ide_cdrom_update_speed(ide_drive_t *drive, u8 *buf) CDC_CD_RW | CDC_DVD | CDC_DVD_R | CDC_DVD_RAM | CDC_GENERIC_PACKET | \ CDC_MO_DRIVE | CDC_MRW | CDC_MRW_W | CDC_RAM) -static struct cdrom_device_ops ide_cdrom_dops = { +static const struct cdrom_device_ops ide_cdrom_dops = { .open = ide_cdrom_open_real, .release = ide_cdrom_release_real, .drive_status = ide_cdrom_drive_status, |