Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

[safe/jmp/linux-2.6] / include / media / videobuf-dma-sg.h

diff --git a/include/media/videobuf-dma-sg.h b/include/media/videobuf-dma-sg.h
index b6ab080..53e72f7 100644 (file)
--- a/include/media/videobuf-dma-sg.h
+++ b/include/media/videobuf-dma-sg.h
@@ -1,7 +1,7 @@
 /*
  * helper functions for SG DMA video4linux capture buffers
  *
- * The functions expect the hardware being able to scatter gatter
+ * The functions expect the hardware being able to scatter gather
  * (i.e. the buffers are not linear in physical memory, but fragmented
  * into PAGE_SIZE chunks).  They also assume the driver does not need
  * to touch the video data.
@@ -49,7 +49,7 @@ struct scatterlist* videobuf_pages_to_sg(struct page **pages, int nr_pages,
  *     does memory allocation too using vmalloc_32().
  *
  * videobuf_dma_*()
- *     see Documentation/DMA-mapping.txt, these functions to
+ *     see Documentation/PCI/PCI-DMA-mapping.txt, these functions to
  *     basically the same.  The map function does also build a
  *     scatterlist for the buffer (and unmap frees it ...)
  *
@@ -68,9 +68,6 @@ struct videobuf_dmabuf {
        /* for kernel buffers */
        void                *vmalloc;
 
-       /* Stores the userspace pointer to vmalloc area */
-       void                *varea;
-
        /* for overlay buffers (pci-pci dma) */
        dma_addr_t          bus_addr;
 
@@ -106,7 +103,7 @@ struct videobuf_dmabuf *videobuf_to_dma (struct videobuf_buffer *buf);
 void *videobuf_sg_alloc(size_t size);
 
 void videobuf_queue_sg_init(struct videobuf_queue* q,
-                        struct videobuf_queue_ops *ops,
+                        const struct videobuf_queue_ops *ops,
                         struct device *dev,
                         spinlock_t *irqlock,
                         enum v4l2_buf_type type,