Commit 6c99eec3 authored by Jens Axboe's avatar Jens Axboe

[PATCH] trm compile

Bad merge from 2.4.20-pre-ac, ide_build_dmatable() does not need data
direction argument in 2.5 (it's implicit in the request)
parent 76dc17b4
...@@ -192,7 +192,7 @@ static int trm290_ide_dma_write (ide_drive_t *drive /*, struct request *rq */) ...@@ -192,7 +192,7 @@ static int trm290_ide_dma_write (ide_drive_t *drive /*, struct request *rq */)
trm290_prepare_drive(drive, 0); /* select PIO xfer */ trm290_prepare_drive(drive, 0); /* select PIO xfer */
return 1; return 1;
#endif #endif
if (!(count = ide_build_dmatable(drive, rq, PCI_DMA_TODEVICE))) { if (!(count = ide_build_dmatable(drive, rq))) {
/* try PIO instead of DMA */ /* try PIO instead of DMA */
trm290_prepare_drive(drive, 0); /* select PIO xfer */ trm290_prepare_drive(drive, 0); /* select PIO xfer */
return 1; return 1;
...@@ -236,7 +236,7 @@ static int trm290_ide_dma_read (ide_drive_t *drive /*, struct request *rq */) ...@@ -236,7 +236,7 @@ static int trm290_ide_dma_read (ide_drive_t *drive /*, struct request *rq */)
task_ioreg_t command = WIN_NOP; task_ioreg_t command = WIN_NOP;
unsigned int count, reading = 2, writing = 0; unsigned int count, reading = 2, writing = 0;
if (!(count = ide_build_dmatable(drive, rq, PCI_DMA_FROMDEVICE))) { if (!(count = ide_build_dmatable(drive, rq))) {
/* try PIO instead of DMA */ /* try PIO instead of DMA */
trm290_prepare_drive(drive, 0); /* select PIO xfer */ trm290_prepare_drive(drive, 0); /* select PIO xfer */
return 1; return 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment