[TIPC]: Fix headercheck wrt. tipc_config.h

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

diff --git a/include/media/videobuf-core.h b/include/media/videobuf-core.h
index 0ac21ae..0fa5d59 100644 (file)
--- a/include/media/videobuf-core.h
+++ b/include/media/videobuf-core.h
@@ -97,6 +97,9 @@ struct videobuf_buffer {
        /* buffer addr (userland ptr!) */
        unsigned long           baddr;
 
+       /* for mmap'ed buffers */
+       struct videobuf_mapping *map;
+
        /* Private pointer to allow specific methods to store their data */
        int                     privsize;
        void                    *priv;
@@ -130,7 +133,7 @@ struct videobuf_qtype_ops {
                                 enum v4l2_memory memory);
        int (*sync)             (struct videobuf_queue* q,
                                 struct videobuf_buffer *buf);
-       int (*copy_to_user)     (struct videobuf_queue *q,
+       int (*video_copy_to_user)(struct videobuf_queue *q,
                                 char __user *data,
                                 size_t count,
                                 int nonblocking);
@@ -143,7 +146,6 @@ struct videobuf_qtype_ops {
        int (*mmap_free)        (struct videobuf_queue *q);
        int (*mmap_mapper)      (struct videobuf_queue *q,
                                struct vm_area_struct *vma);
-       int (*is_mmapped)       (struct videobuf_buffer *buf);
 };
 
 struct videobuf_queue {
@@ -171,9 +173,6 @@ struct videobuf_queue {
 
        /* driver private data */
        void                       *priv_data;
-
-       /*FIXME: should be removed after completing the vb conversion */
-       void                       *priv_ops;
 };
 
 int videobuf_waiton(struct videobuf_buffer *vb, int non_blocking, int intr);
@@ -182,14 +181,15 @@ int videobuf_iolock(struct videobuf_queue* q, struct videobuf_buffer *vb,
 
 void *videobuf_alloc(struct videobuf_queue* q);
 
-void videobuf_queue_init(struct videobuf_queue *q,
+void videobuf_queue_core_init(struct videobuf_queue *q,
                         struct videobuf_queue_ops *ops,
                         void *dev,
                         spinlock_t *irqlock,
                         enum v4l2_buf_type type,
                         enum v4l2_field field,
                         unsigned int msize,
-                        void *priv);
+                        void *priv,
+                        struct videobuf_qtype_ops *int_ops);
 int  videobuf_queue_is_busy(struct videobuf_queue *q);
 void videobuf_queue_cancel(struct videobuf_queue *q);