diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-03-08 11:57:58 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-03-08 11:57:58 +0300 |
| commit | 6120681bdf1a1c648e8c555704b71e04abe2e899 (patch) | |
| tree | a8a3f55c4ed771dc57082d8af2f8d28ab6e5d341 /drivers/scsi/sr.c | |
| parent | 3be5f0d286dc944dee65fdcbddfc4d314f7d4482 (diff) | |
| parent | d6c066fda90d578aacdf19771a027ed484a79825 (diff) | |
| download | linux-6120681bdf1a1c648e8c555704b71e04abe2e899.tar.xz | |
Merge branch 'efi/urgent' into efi/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/scsi/sr.c')
| -rw-r--r-- | drivers/scsi/sr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index 0fbb8fe6e521..e4240e4ae8bb 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c @@ -688,7 +688,7 @@ static const struct block_device_operations sr_bdops = .release = sr_block_release, .ioctl = sr_block_ioctl, #ifdef CONFIG_COMPAT - .ioctl = sr_block_compat_ioctl, + .compat_ioctl = sr_block_compat_ioctl, #endif .check_events = sr_block_check_events, .revalidate_disk = sr_block_revalidate_disk, |