X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=include%2Flinux%2Fi2o.h;h=e92170dda245b3241ef8ae597ace7b43ad2b7f72;hb=205ab99dd103e3dd5b0964dad8a16dfe2db69b2e;hp=333a370a3bdce0d2f6603ab90d01cf455ad49c84;hpb=10b275ddfd05ccb414cfe0cc56a0f47ff20fe807;p=linux-2.6-omap-h63xx.git

diff --git a/include/linux/i2o.h b/include/linux/i2o.h
index 333a370a3bd..e92170dda24 100644
--- a/include/linux/i2o.h
+++ b/include/linux/i2o.h
@@ -32,9 +32,10 @@
 #include <linux/workqueue.h>	/* work_struct */
 #include <linux/mempool.h>
 #include <linux/mutex.h>
+#include <linux/scatterlist.h>
+#include <linux/semaphore.h>	/* Needed for MUTEX init macros */
 
 #include <asm/io.h>
-#include <asm/semaphore.h>	/* Needed for MUTEX init macros */
 
 /* message queue empty */
 #define I2O_QUEUE_EMPTY		0xffffffff
@@ -837,7 +838,7 @@ static inline int i2o_dma_map_sg(struct i2o_controller *c,
 		if ((sizeof(dma_addr_t) > 4) && c->pae_support)
 			*mptr++ = cpu_to_le32(i2o_dma_high(sg_dma_address(sg)));
 #endif
-		sg++;
+		sg = sg_next(sg);
 	}
 	*sg_ptr = mptr;
 
@@ -946,8 +947,7 @@ static inline int i2o_pool_alloc(struct i2o_pool *pool, const char *name,
 	strcpy(pool->name, name);
 
 	pool->slab =
-	    kmem_cache_create(pool->name, size, 0, SLAB_HWCACHE_ALIGN, NULL,
-			      NULL);
+	    kmem_cache_create(pool->name, size, 0, SLAB_HWCACHE_ALIGN, NULL);
 	if (!pool->slab)
 		goto free_name;