[POWERPC] replace asm/of_device.h with linux/of_device.h in macio.h

[linux-2.6-omap-h63xx.git] / block / blk-map.c

diff --git a/block/blk-map.c b/block/blk-map.c
index 4e17dfd0035d1f889f6e8577b42162c57dd554f1..c07d9c8317f4c055d3821302c22df20cf2627195 100644 (file)
--- a/block/blk-map.c
+++ b/block/blk-map.c
@@ -152,10 +152,10 @@ int blk_rq_map_user(struct request_queue *q, struct request *rq,
         */
        if (len & q->dma_pad_mask) {
                unsigned int pad_len = (q->dma_pad_mask & ~len) + 1;
-               struct bio *bio = rq->biotail;
+               struct bio *tail = rq->biotail;
 
-               bio->bi_io_vec[bio->bi_vcnt - 1].bv_len += pad_len;
-               bio->bi_size += pad_len;
+               tail->bi_io_vec[tail->bi_vcnt - 1].bv_len += pad_len;
+               tail->bi_size += pad_len;
 
                rq->extra_len += pad_len;
        }
@@ -217,7 +217,6 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq,
        rq->buffer = rq->data = NULL;
        return 0;
 }
-EXPORT_SYMBOL(blk_rq_map_user_iov);
 
 /**
  * blk_rq_unmap_user - unmap a request with user data