X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fieee1394%2Fdma.c;h=f5f4983dfbf3db5cc85fc77522ddc510e6839504;hb=26adc0d5859788b74f86677538236f807e6d9021;hp=45d6055819227367fb318e472b1ee2de990b458f;hpb=40caf5ea5a7d47f8a33e26b63ca81dea4b5109d2;p=linux-2.6

diff --git a/drivers/ieee1394/dma.c b/drivers/ieee1394/dma.c
index 45d6055819..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);
 
-		dma->sglist[i].page = 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 */