diff options
| author | Thomas Bogendoerfer <tsbogend@alpha.franken.de> | 2020-03-30 13:31:37 +0200 |
|---|---|---|
| committer | Thomas Bogendoerfer <tsbogend@alpha.franken.de> | 2020-03-30 13:31:37 +0200 |
| commit | ba15533275dd70238b523417d222d43fb40dac9d (patch) | |
| tree | e97f6b804994d20ce476dc5a123fc074799e9584 /drivers/ide | |
| parent | f75410a406e934e4cf31e0a7ec151799a6bf38cf (diff) | |
| parent | 7111951b8d4973bda27ff663f2cf18b663d15b48 (diff) | |
| download | linux-ba15533275dd70238b523417d222d43fb40dac9d.tar.gz linux-ba15533275dd70238b523417d222d43fb40dac9d.tar.bz2 linux-ba15533275dd70238b523417d222d43fb40dac9d.zip | |
Merge tag 'v5.6' into mips-next
Linux 5.6
Diffstat (limited to 'drivers/ide')
| -rw-r--r-- | drivers/ide/ide-gd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-gd.c b/drivers/ide/ide-gd.c index 1bb99b556393..05c26986637b 100644 --- a/drivers/ide/ide-gd.c +++ b/drivers/ide/ide-gd.c @@ -361,7 +361,7 @@ static const struct block_device_operations ide_gd_ops = { .release = ide_gd_release, .ioctl = ide_gd_ioctl, #ifdef CONFIG_COMPAT - .ioctl = ide_gd_compat_ioctl, + .compat_ioctl = ide_gd_compat_ioctl, #endif .getgeo = ide_gd_getgeo, .check_events = ide_gd_check_events, |