[PATCH] 2.6.0-test4 PowerMac IDE breakage

[Mikael Pettersson]

PowerMac's IDE driver got broken in 2.6.0-test4:

  ppc-unknown-linux-gcc -Wp,-MD,drivers/ide/ppc/.pmac.o.d -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -Iarch/ppc -msoft-float -pipe -ffixed-r2 -Wno-uninitialized -mmultiple -mstring -D__KERNEL__ -Iinclude -Iarch/ppc -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -Iarch/ppc -msoft-float -pipe -ffixed-r2 -Wno-uninitialized -mmultiple -mstring -fomit-frame-pointer -nostdinc -iwithprefix include  -Idrivers/ide  -DKBUILD_BASENAME=pmac -DKBUILD_MODNAME=pmac -c -o drivers/ide/ppc/pmac.o drivers/ide/ppc/pmac.c
drivers/ide/ppc/pmac.c: In function `pmac_ide_build_sglist':
drivers/ide/ppc/pmac.c:945: warning: passing arg 1 of `blk_rq_map_sg' from incompatible pointer type

Fixed by the patch below.

/Mikael

diff -ruN linux-2.6.0-test4/drivers/ide/ppc/pmac.c linux-2.6.0-test4.ide-pmac-fix/drivers/ide/ppc/pmac.c
--- linux-2.6.0-test4/drivers/ide/ppc/pmac.c	2003-08-23 12:46:26.000000000 +0200
+++ linux-2.6.0-test4.ide-pmac-fix/drivers/ide/ppc/pmac.c	2003-08-23 13:04:32.000000000 +0200
@@ -942,7 +942,7 @@
 	if (hwif->sg_dma_active)
 		BUG();
 		
-	nents = blk_rq_map_sg(&drive->queue, rq, sg);
+	nents = blk_rq_map_sg(drive->queue, rq, sg);
 		
 	if (rq_data_dir(rq) == READ)
 		pmif->sg_dma_direction = PCI_DMA_FROMDEVICE;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/