diff options
Diffstat (limited to 'include/media')
-rw-r--r-- | include/media/videobuf-core.h | 4 | ||||
-rw-r--r-- | include/media/videobuf-dma-sg.h | 1 | ||||
-rw-r--r-- | include/media/videobuf-vmalloc.h | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/include/media/videobuf-core.h b/include/media/videobuf-core.h index 0ac21ae44f69..96949e31eaf8 100644 --- a/include/media/videobuf-core.h +++ b/include/media/videobuf-core.h | |||
@@ -97,6 +97,9 @@ struct videobuf_buffer { | |||
97 | /* buffer addr (userland ptr!) */ | 97 | /* buffer addr (userland ptr!) */ |
98 | unsigned long baddr; | 98 | unsigned long baddr; |
99 | 99 | ||
100 | /* for mmap'ed buffers */ | ||
101 | struct videobuf_mapping *map; | ||
102 | |||
100 | /* Private pointer to allow specific methods to store their data */ | 103 | /* Private pointer to allow specific methods to store their data */ |
101 | int privsize; | 104 | int privsize; |
102 | void *priv; | 105 | void *priv; |
@@ -143,7 +146,6 @@ struct videobuf_qtype_ops { | |||
143 | int (*mmap_free) (struct videobuf_queue *q); | 146 | int (*mmap_free) (struct videobuf_queue *q); |
144 | int (*mmap_mapper) (struct videobuf_queue *q, | 147 | int (*mmap_mapper) (struct videobuf_queue *q, |
145 | struct vm_area_struct *vma); | 148 | struct vm_area_struct *vma); |
146 | int (*is_mmapped) (struct videobuf_buffer *buf); | ||
147 | }; | 149 | }; |
148 | 150 | ||
149 | struct videobuf_queue { | 151 | struct videobuf_queue { |
diff --git a/include/media/videobuf-dma-sg.h b/include/media/videobuf-dma-sg.h index 62a3709905f3..206d9027b39f 100644 --- a/include/media/videobuf-dma-sg.h +++ b/include/media/videobuf-dma-sg.h | |||
@@ -86,7 +86,6 @@ struct videbuf_pci_sg_memory | |||
86 | u32 magic; | 86 | u32 magic; |
87 | 87 | ||
88 | /* for mmap'ed buffers */ | 88 | /* for mmap'ed buffers */ |
89 | struct videobuf_mapping *map; | ||
90 | struct videobuf_dmabuf dma; | 89 | struct videobuf_dmabuf dma; |
91 | }; | 90 | }; |
92 | 91 | ||
diff --git a/include/media/videobuf-vmalloc.h b/include/media/videobuf-vmalloc.h index 5fff68df6689..26a8958d23d1 100644 --- a/include/media/videobuf-vmalloc.h +++ b/include/media/videobuf-vmalloc.h | |||
@@ -21,9 +21,6 @@ struct videbuf_vmalloc_memory | |||
21 | { | 21 | { |
22 | u32 magic; | 22 | u32 magic; |
23 | 23 | ||
24 | /* for mmap'ed buffers */ | ||
25 | struct videobuf_mapping *map; | ||
26 | |||
27 | void *vmalloc; | 24 | void *vmalloc; |
28 | 25 | ||
29 | /* remap_vmalloc_range seems to need to run after mmap() on some cases */ | 26 | /* remap_vmalloc_range seems to need to run after mmap() on some cases */ |