diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-11-25 16:55:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-11-25 16:55:56 -0800 |
| commit | 819d88167a871b24f9c721871448d4c72540037d (patch) | |
| tree | 0af778959141604e97c0bfcd758b3dc6ef1bc388 /include/linux | |
| parent | 968c6d06a9ad084b7d816f1e70eaa29cc806ea00 (diff) | |
| parent | e268cd692becbdf5b282803fd787f3bd236f0ae9 (diff) | |
Merge master.kernel.org:/home/davem/BK/sparc-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
| -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 c4fdbf756d52..033e94a6d6e4 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -1715,7 +1715,7 @@ static inline int __ide_dma_queued_off(ide_drive_t *drive) #endif #else -static inline void ide_release_dma(ide_hwif_t *) {;} +static inline void ide_release_dma(ide_hwif_t *drive) {;} #endif extern void hwif_unregister(ide_hwif_t *); |