const: constify remaining dev_pm_ops

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

diff --git a/include/media/videobuf-vmalloc.h b/include/media/videobuf-vmalloc.h
index 5fff68d..4b419a2 100644 (file)
--- a/include/media/videobuf-vmalloc.h
+++ b/include/media/videobuf-vmalloc.h
@@ -1,7 +1,7 @@
 /*
  * helper functions for vmalloc 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.
@@ -12,18 +12,17 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2
  */
+#ifndef _VIDEOBUF_VMALLOC_H
+#define _VIDEOBUF_VMALLOC_H
 
 #include <media/videobuf-core.h>
 
 /* --------------------------------------------------------------------- */
 
-struct videbuf_vmalloc_memory
+struct videobuf_vmalloc_memory
 {
        u32                 magic;
 
-       /* for mmap'ed buffers */
-       struct videobuf_mapping *map;
-
        void                *vmalloc;
 
        /* remap_vmalloc_range seems to need to run after mmap() on some cases */
@@ -31,8 +30,8 @@ struct videbuf_vmalloc_memory
 };
 
 void videobuf_queue_vmalloc_init(struct videobuf_queue* q,
-                        struct videobuf_queue_ops *ops,
-                        void *dev,
+                        const struct videobuf_queue_ops *ops,
+                        struct device *dev,
                         spinlock_t *irqlock,
                         enum v4l2_buf_type type,
                         enum v4l2_field field,
@@ -42,3 +41,5 @@ void videobuf_queue_vmalloc_init(struct videobuf_queue* q,
 void *videobuf_to_vmalloc (struct videobuf_buffer *buf);
 
 void videobuf_vmalloc_free (struct videobuf_buffer *buf);
+
+#endif