diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2024-07-11 05:23:30 +0300 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2024-07-11 05:23:30 +0300 |
| commit | 5e9a522b0779fa67928b7726374e60461e8aa5c5 (patch) | |
| tree | 69d560c649c0768577590a3b27d21b6391269b63 /include/linux | |
| parent | 6cd48c8f62ade6260ff9a13724e49b3854392fe4 (diff) | |
| parent | 7a6bbc2829d4ab592c7e440a6f6f5deb3cd95db4 (diff) | |
| download | linux-5e9a522b0779fa67928b7726374e60461e8aa5c5.tar.xz | |
Merge branch '6.10/scsi-fixes' into 6.11/scsi-staging
Pull in my fixes branch to resolve an mpi3mr merge conflict reported
by sfr.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/cdrom.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h index 98c6fd0b39b6..fdfb61ccf55a 100644 --- a/include/linux/cdrom.h +++ b/include/linux/cdrom.h @@ -77,7 +77,7 @@ struct cdrom_device_ops { unsigned int clearing, int slot); int (*tray_move) (struct cdrom_device_info *, int); int (*lock_door) (struct cdrom_device_info *, int); - int (*select_speed) (struct cdrom_device_info *, int); + int (*select_speed) (struct cdrom_device_info *, unsigned long); int (*get_last_session) (struct cdrom_device_info *, struct cdrom_multisession *); int (*get_mcn) (struct cdrom_device_info *, |