diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-20 22:48:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-20 22:48:42 -0700 |
| commit | 38f061c5714265fa8481cc0b7795aa8fe81b45be (patch) | |
| tree | e145112bc2ddcbd1fdd8c7d582603f253e0ef3f4 /include/linux | |
| parent | 09d4b9aa90ab7a0ce7c266d2ea18153bf79bba33 (diff) | |
| parent | b0244a00451c1ad64bf0a51f50679f7146786780 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
ide-disk: workaround for buggy HPA support on ST340823A (take 3)
hpt34x: fix CONFIG_HPT34X_AUTODMA=n handling
triflex: add missing ->dma_base check
pdc202xx_old: add missing ->dma_base check
pdc202xx_new: add missing ->dma_base check
cs5530: add missing ->dma_base check
ide: ide_config_drive_speed() bugfixes
ide: add cable detection for early UDMA66 devices (take 3)
ide-pmac: fix drive->init_speed reporting
ide: config_drive_for_dma() fixes
ide-cris: fix ->set_pio_mode method to set transfer mode on the device
ide: fix hidden dependencies on CONFIG_IDE_GENERIC
ide: make CONFIG_IDE_GENERIC default to N
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ide.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index d71d0121b7f9..c792b4fd1588 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -1285,13 +1285,14 @@ void ide_init_sg_cmd(ide_drive_t *, struct request *); #define BAD_DMA_DRIVE 0 #define GOOD_DMA_DRIVE 1 -#ifdef CONFIG_BLK_DEV_IDEDMA struct drive_list_entry { const char *id_model; const char *id_firmware; }; int ide_in_drive_list(struct hd_driveid *, const struct drive_list_entry *); + +#ifdef CONFIG_BLK_DEV_IDEDMA int __ide_dma_bad_drive(ide_drive_t *); int __ide_dma_good_drive(ide_drive_t *); u8 ide_max_dma_mode(ide_drive_t *); @@ -1312,7 +1313,6 @@ void ide_dma_host_off(ide_drive_t *); void ide_dma_off_quietly(ide_drive_t *); void ide_dma_host_on(ide_drive_t *); extern int __ide_dma_on(ide_drive_t *); -extern int __ide_dma_check(ide_drive_t *); extern int ide_dma_setup(ide_drive_t *); extern void ide_dma_start(ide_drive_t *); extern int __ide_dma_end(ide_drive_t *); |