Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Signed-off-by: Steve French <sfrench@us.ibm.com>

1 files changed, 1 insertions, 3 deletions

diff --git a/include/linux/i2o.h b/include/linux/i2o.h
index 5a9d8c599171..dd7d627bf66f 100644
--- a/include/linux/i2o.h
+++ b/include/linux/i2o.h
@@ -950,9 +950,7 @@ static inline int i2o_pool_alloc(struct i2o_pool *pool, const char *name,
         if (!pool->slab)
                 goto free_name;
 
-        pool->mempool =
-            mempool_create(min_nr, mempool_alloc_slab, mempool_free_slab,
-                           pool->slab);
+        pool->mempool = mempool_create_slab_pool(min_nr, pool->slab);
         if (!pool->mempool)
                 goto free_slab;