Skip to content

L
linux-davinci
Commit bbd25700 authored by Andrew Morton's avatar Andrew Morton Committed by James Toy
Browse files
Options

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

parent b3263a35
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 6 deletions
drivers/block/aoe/aoeblk.c
View file @ bbd25700
......@@ -264,14 +264,8 @@ aoeblk_gdalloc(void *vp)
goto err_disk;
}
<<<<<<< HEAD:drivers/block/aoe/aoeblk.c
d->blkq = blk_alloc_queue(GFP_KERNEL);
if (!d->blkq)
=======
blk_queue_make_request(&d->blkq, aoeblk_make_request);
d->blkq.backing_dev_info.name = "aoe";
if (bdi_init(&d->blkq.backing_dev_info))
>>>>>>> FETCH_HEAD:drivers/block/aoe/aoeblk.c
goto err_mempool;
blk_queue_make_request(d->blkq, aoeblk_make_request);
if (bdi_init(&d->blkq->backing_dev_info))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment