diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ide.h | 11 | ||||
| -rw-r--r-- | include/linux/pci_ids.h | 1 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index aa3d9c39913f..6dafc47697ff 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -815,7 +815,6 @@ typedef struct ide_task_s { int command_type; ide_pre_handler_t *prehandler; ide_handler_t *handler; - ide_post_handler_t *posthandler; void *special; /* valid_t generally */ struct request *rq; /* copy of request */ unsigned long block; /* copy of block */ @@ -842,17 +841,17 @@ void do_taskfile (ide_drive_t *drive, struct hd_drive_task_hdr *taskfile, struct * Special Flagged Register Validation Caller */ -ide_startstop_t set_multmode_intr (ide_drive_t *drive); -ide_startstop_t task_no_data_intr (ide_drive_t *drive); +extern ide_startstop_t recal_intr(ide_drive_t *drive); +extern ide_startstop_t set_geometry_intr(ide_drive_t *drive); +extern ide_startstop_t set_multmode_intr(ide_drive_t *drive); +extern ide_startstop_t task_no_data_intr(ide_drive_t *drive); int ide_wait_taskfile (ide_drive_t *drive, struct hd_drive_task_hdr *taskfile, struct hd_drive_hob_hdr *hobfile, byte *buf); int ide_raw_taskfile (ide_drive_t *drive, ide_task_t *cmd, byte *buf); -ide_pre_handler_t * ide_pre_handler_parser (struct hd_drive_task_hdr *taskfile, struct hd_drive_hob_hdr *hobfile); -ide_handler_t * ide_handler_parser (struct hd_drive_task_hdr *taskfile, struct hd_drive_hob_hdr *hobfile); /* Expects args is a full set of TF registers and parses the command type */ -int ide_cmd_type_parser (ide_task_t *args); +extern void ide_cmd_type_parser(ide_task_t *args); int ide_cmd_ioctl (ide_drive_t *drive, struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg); int ide_task_ioctl (ide_drive_t *drive, struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg); diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 30c965801c10..41eed9cd438e 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -865,6 +865,7 @@ #define PCI_DEVICE_ID_NVIDIA_GEFORCE2_GTS2 0x0151 #define PCI_DEVICE_ID_NVIDIA_GEFORCE2_ULTRA 0x0152 #define PCI_DEVICE_ID_NVIDIA_QUADRO2_PRO 0x0153 +#define PCI_DEVICE_ID_NVIDIA_NFORCE_IDE 0x01bc #define PCI_VENDOR_ID_IMS 0x10e0 #define PCI_DEVICE_ID_IMS_8849 0x8849 |