Merge branch 'akpm' (Andrew's incoming - part two)

[mv-sheeva.git] / include / media / videobuf2-dma-contig.h

diff --git a/include/media/videobuf2-dma-contig.h b/include/media/videobuf2-dma-contig.h
index 7e6c68b23773b7d9fa237fbea8d84c085670a9ea..19ae1e3505678bb32aa810823d619b06b88993d4 100644 (file)
--- a/include/media/videobuf2-dma-contig.h
+++ b/include/media/videobuf2-dma-contig.h
@@ -17,11 +17,11 @@
 #include <linux/dma-mapping.h>
 
 static inline dma_addr_t
-vb2_dma_contig_plane_paddr(struct vb2_buffer *vb, unsigned int plane_no)
+vb2_dma_contig_plane_dma_addr(struct vb2_buffer *vb, unsigned int plane_no)
 {
-       dma_addr_t *paddr = vb2_plane_cookie(vb, plane_no);
+       dma_addr_t *addr = vb2_plane_cookie(vb, plane_no);
 
-       return *paddr;
+       return *addr;
 }
 
 void *vb2_dma_contig_init_ctx(struct device *dev);