diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-05-22 11:10:55 -0400 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-05-22 11:10:55 -0400 |
| commit | 4c9773ed7946fc375edba057770f5ef16d8b44fe (patch) | |
| tree | cd642c901d6b6f051cbe7a29e6565913e61f0614 /include/linux/ide.h | |
| parent | 9f36d31437922354d104a2db407f397e79e4027e (diff) | |
| parent | 5993856e53fbc4b4f28e2d481deaebeb715b1267 (diff) | |
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 *); | |||
| 1093 | 1093 | ||
| 1094 | extern void ide_fixstring(u8 *, const int, const int); | 1094 | extern void ide_fixstring(u8 *, const int, const int); |
| 1095 | 1095 | ||
| 1096 | int ide_busy_sleep(ide_hwif_t *, unsigned long, int); | 1096 | int ide_busy_sleep(ide_drive_t *, unsigned long, int); |
| 1097 | 1097 | ||
| 1098 | int ide_wait_stat(ide_startstop_t *, ide_drive_t *, u8, u8, unsigned long); | 1098 | int ide_wait_stat(ide_startstop_t *, ide_drive_t *, u8, u8, unsigned long); |
| 1099 | 1099 | ||