diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-06-15 22:33:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-06-15 22:33:40 -0700 |
| commit | 509c4ed357bd559c1e206b03bad2a2b2b13e1ed8 (patch) | |
| tree | 0c7232946362594c3adcf995a21d9d061f2a569e /include/linux | |
| parent | 9f64c00f02dd44ca4c5096871f0c2e8af415b90a (diff) | |
| parent | 78929a189fde6d63e650818b11c96e38a685b927 (diff) | |
Merge kiwi:v2.5/linux into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ide.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index 07152eaa933e..e07d0f19fcd1 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -680,8 +680,7 @@ static inline void ide_unmap_rq(struct request *rq, char *to, bio_kunmap_irq(to, flags); } -extern ide_startstop_t ata_special_intr(struct ata_device *, struct request *); -extern int ide_raw_taskfile(struct ata_device *, struct ata_taskfile *); +extern int ide_raw_taskfile(struct ata_device *, struct ata_taskfile *, char *); extern void ide_fix_driveid(struct hd_driveid *id); extern int ide_config_drive_speed(struct ata_device *, byte); @@ -785,7 +784,7 @@ static inline void udma_irq_lost(struct ata_device *drive) #ifdef CONFIG_BLK_DEV_IDEDMA extern void udma_pci_enable(struct ata_device *drive, int on, int verbose); -extern int udma_pci_start(struct ata_device *drive, struct request *rq); +extern void udma_pci_start(struct ata_device *drive, struct request *rq); extern int udma_pci_stop(struct ata_device *drive); extern int udma_pci_init(struct ata_device *drive, struct request *rq); extern int udma_pci_irq_status(struct ata_device *drive); |