Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc

[~andy/linux] / include / media / videobuf-vmalloc.h

diff --git a/include/media/videobuf-vmalloc.h b/include/media/videobuf-vmalloc.h
index 5fff68df66896ae963303e4718a558712dfa6dc2..aed39460c154cf73a8d8ecb55fe5edd51dec35b9 100644 (file)
--- a/include/media/videobuf-vmalloc.h
+++ b/include/media/videobuf-vmalloc.h
@@ -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 */
@@ -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