Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.23

[linux-2.6-omap-h63xx.git] / drivers / block / aoe / aoeblk.c

diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
index 478489c568a4c9f9de45cc05aba97f294d80bff8..007faaf008e7863bc6da15c1ec402813ec5df400 100644 (file)
--- a/drivers/block/aoe/aoeblk.c
+++ b/drivers/block/aoe/aoeblk.c
@@ -125,7 +125,7 @@ aoeblk_release(struct inode *inode, struct file *filp)
 }
 
 static int
-aoeblk_make_request(request_queue_t *q, struct bio *bio)
+aoeblk_make_request(struct request_queue *q, struct bio *bio)
 {
        struct aoedev *d;
        struct buf *buf;
@@ -257,9 +257,9 @@ aoeblk_exit(void)
 int __init
 aoeblk_init(void)
 {
-       buf_pool_cache = kmem_cache_create("aoe_bufs", 
+       buf_pool_cache = kmem_cache_create("aoe_bufs",
                                           sizeof(struct buf),
-                                          0, 0, NULL, NULL);
+                                          0, 0, NULL);
        if (buf_pool_cache == NULL)
                return -ENOMEM;