diff options
Diffstat (limited to 'include/linux/ide.h')
-rw-r--r-- | include/linux/ide.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index 89e53cfbc787..54525be4b5f8 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
@@ -474,8 +474,8 @@ struct ide_disk_ops { | |||
474 | ide_startstop_t (*do_request)(struct ide_drive_s *, struct request *, | 474 | ide_startstop_t (*do_request)(struct ide_drive_s *, struct request *, |
475 | sector_t); | 475 | sector_t); |
476 | int (*end_request)(struct ide_drive_s *, int, int); | 476 | int (*end_request)(struct ide_drive_s *, int, int); |
477 | int (*ioctl)(struct ide_drive_s *, struct inode *, | 477 | int (*ioctl)(struct ide_drive_s *, struct block_device *, |
478 | struct file *, unsigned int, unsigned long); | 478 | fmode_t, unsigned int, unsigned long); |
479 | }; | 479 | }; |
480 | 480 | ||
481 | /* ATAPI device flags */ | 481 | /* ATAPI device flags */ |
@@ -1158,8 +1158,7 @@ struct ide_ioctl_devset { | |||
1158 | int ide_setting_ioctl(ide_drive_t *, struct block_device *, unsigned int, | 1158 | int ide_setting_ioctl(ide_drive_t *, struct block_device *, unsigned int, |
1159 | unsigned long, const struct ide_ioctl_devset *); | 1159 | unsigned long, const struct ide_ioctl_devset *); |
1160 | 1160 | ||
1161 | int generic_ide_ioctl(ide_drive_t *, struct file *, struct block_device *, | 1161 | int generic_ide_ioctl(ide_drive_t *, struct block_device *, unsigned, unsigned long); |
1162 | unsigned, unsigned long); | ||
1163 | 1162 | ||
1164 | extern int ide_vlb_clk; | 1163 | extern int ide_vlb_clk; |
1165 | extern int ide_pci_clk; | 1164 | extern int ide_pci_clk; |