X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fieee1394%2Fdma.c;h=f5f4983dfbf3db5cc85fc77522ddc510e6839504;hb=8c56a347c1dfbe384b1ffb65d8828faa36dbaea4;hp=25e113b50d8672b0310036138125840365b12e97;hpb=f09cc910fe3af7e63298105bc0482653eb534c3c;p=linux-2.6

diff --git a/drivers/ieee1394/dma.c b/drivers/ieee1394/dma.c
index 25e113b50d..f5f4983dfb 100644
--- a/drivers/ieee1394/dma.c
+++ b/drivers/ieee1394/dma.c
@@ -12,7 +12,7 @@
 #include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
-#include <asm/scatterlist.h>
+#include <linux/scatterlist.h>
 
 #include "dma.h"
 
@@ -111,8 +111,8 @@ int dma_region_alloc(struct dma_region *dma, unsigned long n_bytes,
 		unsigned long va =
 		    (unsigned long)dma->kvirt + (i << PAGE_SHIFT);
 
-		sg_set_page(&dma->sglist[i], vmalloc_to_page((void *)va));
-		dma->sglist[i].length = PAGE_SIZE;
+		sg_set_page(&dma->sglist[i], vmalloc_to_page((void *)va),
+				PAGE_SIZE, 0);
 	}
 
 	/* map sglist to the IOMMU */