diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-17 13:32:49 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-17 13:32:49 -0800 |
commit | 07232b971577442de0821afa0abafb6531b6192e (patch) | |
tree | 78c3558239eaebc65df72b40a6a2c6ddc3a02998 /include/linux | |
parent | ea9e7b5569a538123dc4d60ba36b9170ca8e8830 (diff) | |
parent | 644a9d764b4747af057b3db73ccba28a168b1f4f (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: fix ->io_32bit race in set_io_32bit()
ide: remove stale changelog from ide-probe.c
ide: remove stale changelog from ide-disk.c
ide: remove dead code from __ide_dma_test_irq()
hpt366: fix HPT37x PIO mode timings (take 2)
pdc202xx_new: fix Promise TX4 support
ide-cd: remove dead post_transform_command()
ide: DMA reporting and validity checking fixes (take 3)
ide: add /sys/bus/ide/devices/*/{model,firmware,serial} sysfs entries
ide: coding style fixes for drivers/ide/setup-pci.c
ide: fix ide_scan_pcibus() error message
ide: deprecate CONFIG_BLK_DEV_OFFBOARD
ide: add missing checks for control register existence
ide-scsi: add ide_scsi_hex_dump() helper
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/ide.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index dc75ccbcf991..9a6a41e7079f 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -1255,6 +1255,7 @@ 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_id_dma_bug(ide_drive_t *); u8 ide_find_dma_mode(ide_drive_t *, u8); @@ -1264,7 +1265,6 @@ static inline u8 ide_max_dma_mode(ide_drive_t *drive) } void ide_dma_off(ide_drive_t *); -void ide_dma_verbose(ide_drive_t *); int ide_set_dma(ide_drive_t *); ide_startstop_t ide_dma_intr(ide_drive_t *); @@ -1287,6 +1287,7 @@ extern void ide_dma_timeout(ide_drive_t *); #endif /* CONFIG_BLK_DEV_IDEDMA_PCI */ #else +static inline int ide_id_dma_bug(ide_drive_t *drive) { return 0; } static inline u8 ide_find_dma_mode(ide_drive_t *drive, u8 speed) { return 0; } static inline u8 ide_max_dma_mode(ide_drive_t *drive) { return 0; } static inline void ide_dma_off(ide_drive_t *drive) { ; } @@ -1333,8 +1334,7 @@ static inline void ide_set_hwifdata (ide_hwif_t * hwif, void *data) hwif->hwif_data = data; } -/* ide-lib.c */ -extern char *ide_xfer_verbose(u8 xfer_rate); +const char *ide_xfer_verbose(u8 mode); extern void ide_toggle_bounce(ide_drive_t *drive, int on); extern int ide_set_xfer_rate(ide_drive_t *drive, u8 rate); |