GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-06-17 20:25:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'for-linus' into for-next

Browse source
This commit is contained in:
Bartlomiej Zolnierkiewicz 2009-05-22 17:10:55 +02:00
commit 4c9773ed79
7 changed files with 35 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/linux/ide.h
View file

@ -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);