git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/ctxfi' into for-linus
[pandora-kernel.git]
/
include
/
linux
/
ide.h
diff --git
a/include/linux/ide.h
b/include/linux/ide.h
index
ff65fff
..
9fed365
100644
(file)
--- a/
include/linux/ide.h
+++ b/
include/linux/ide.h
@@
-1109,7
+1109,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);