summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMartin K. Petersen <martin.petersen@oracle.com>2024-05-28 21:29:03 -0400
committerMartin K. Petersen <martin.petersen@oracle.com>2024-05-28 21:29:03 -0400
commit4fedb1f0959973738ef9ac7e52ea0c260f1a3302 (patch)
tree9efa44cf1595e4cc1c12830675a589161b588495 /include
parent1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 (diff)
parentd09c05aa35909adb7d29f92f0cd79fdcd1338ef0 (diff)
Merge branch '6.10/scsi-queue' into 6.10/scsi-fixes
Pull in remaining commits from 6.10/scsi-queue. Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/cdrom.h2
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 *,