diff options
Diffstat (limited to 'drivers/media/platform/omap3isp/ispqueue.h')
-rw-r--r-- | drivers/media/platform/omap3isp/ispqueue.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/platform/omap3isp/ispqueue.h b/drivers/media/platform/omap3isp/ispqueue.h index 0899a116b4d5..99c11e8c6e9d 100644 --- a/drivers/media/platform/omap3isp/ispqueue.h +++ b/drivers/media/platform/omap3isp/ispqueue.h | |||
@@ -73,8 +73,7 @@ enum isp_video_buffer_state { | |||
73 | * @npages: Number of pages (for userspace buffers) | 73 | * @npages: Number of pages (for userspace buffers) |
74 | * @pages: Pages table (for userspace non-VM_PFNMAP buffers) | 74 | * @pages: Pages table (for userspace non-VM_PFNMAP buffers) |
75 | * @paddr: Memory physical address (for userspace VM_PFNMAP buffers) | 75 | * @paddr: Memory physical address (for userspace VM_PFNMAP buffers) |
76 | * @sglen: Number of elements in the scatter list (for non-VM_PFNMAP buffers) | 76 | * @sgt: Scatter gather table (for non-VM_PFNMAP buffers) |
77 | * @sglist: Scatter list (for non-VM_PFNMAP buffers) | ||
78 | * @vbuf: V4L2 buffer | 77 | * @vbuf: V4L2 buffer |
79 | * @irqlist: List head for insertion into IRQ queue | 78 | * @irqlist: List head for insertion into IRQ queue |
80 | * @state: Current buffer state | 79 | * @state: Current buffer state |
@@ -98,8 +97,7 @@ struct isp_video_buffer { | |||
98 | dma_addr_t paddr; | 97 | dma_addr_t paddr; |
99 | 98 | ||
100 | /* For all buffers except VM_PFNMAP. */ | 99 | /* For all buffers except VM_PFNMAP. */ |
101 | unsigned int sglen; | 100 | struct sg_table sgt; |
102 | struct scatterlist *sglist; | ||
103 | 101 | ||
104 | /* Touched by the interrupt handler. */ | 102 | /* Touched by the interrupt handler. */ |
105 | struct v4l2_buffer vbuf; | 103 | struct v4l2_buffer vbuf; |