diff options
| author |  Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
| 2009-05-22 17:10:55 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
| 2009-05-22 17:10:55 +0200 |
| commit | 4c9773ed7946fc375edba057770f5ef16d8b44fe (patch) | |
| tree | cd642c901d6b6f051cbe7a29e6565913e61f0614 /include/linux/ide.h | |
| parent | ide: remove hw_regs_t typedef (diff) | |
| parent | via82cxxx: Add VIA VX855 PCI Device ID (diff) | |
| download | linux-4c9773ed7946fc375edba057770f5ef16d8b44fe.tar.gz linux-4c9773ed7946fc375edba057770f5ef16d8b44fe.tar.bz2 linux-4c9773ed7946fc375edba057770f5ef16d8b44fe.zip | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'include/linux/ide.h')
| -rw-r--r-- | include/linux/ide.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index b1b903a0dac8..015955632091 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -1093,7 +1093,7 @@ void ide_fix_driveid(u16 *); extern void ide_fixstring(u8 *, const int, const int); -int ide_busy_sleep(ide_hwif_t *, unsigned long, int); +int ide_busy_sleep(ide_drive_t *, unsigned long, int); int ide_wait_stat(ide_startstop_t *, ide_drive_t *, u8, u8, unsigned long); |