diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-01-17 22:49:59 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-01-17 22:49:59 -0500 |
| commit | d65177c1ae7f085723154105c5dc8d9e16ae8265 (patch) | |
| tree | 14408129d880d89cc5e937f2810f243ed1e6fcde /drivers/ide/ide-taskfile.c | |
| parent | d41f084a74de860fe879403fbbad13abdf7aea8e (diff) | |
| parent | 15578eeb6cd4b74492f26e60624aa1a9a52ddd7b (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'drivers/ide/ide-taskfile.c')
| -rw-r--r-- | drivers/ide/ide-taskfile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c index 62ebefd6394a..9834dce4e20f 100644 --- a/drivers/ide/ide-taskfile.c +++ b/drivers/ide/ide-taskfile.c | |||
| @@ -308,7 +308,7 @@ static void ide_pio_multi(ide_drive_t *drive, unsigned int write) | |||
| 308 | ide_pio_sector(drive, write); | 308 | ide_pio_sector(drive, write); |
| 309 | } | 309 | } |
| 310 | 310 | ||
| 311 | static inline void ide_pio_datablock(ide_drive_t *drive, struct request *rq, | 311 | static void ide_pio_datablock(ide_drive_t *drive, struct request *rq, |
| 312 | unsigned int write) | 312 | unsigned int write) |
| 313 | { | 313 | { |
| 314 | if (rq->bio) /* fs request */ | 314 | if (rq->bio) /* fs request */ |