git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[media] media: videobuf2: Restructure vb2_buffer
[sfrench/cifs-2.6.git]
/
drivers
/
media
/
platform
/
omap3isp
/
ispvideo.h
diff --git
a/drivers/media/platform/omap3isp/ispvideo.h
b/drivers/media/platform/omap3isp/ispvideo.h
index 4071dd7060ea52868a4de5ff4b79ec4cd2cccf4f..bcf0e0acc8f387a86aabeb31181e4cbfb827397f 100644
(file)
--- a/
drivers/media/platform/omap3isp/ispvideo.h
+++ b/
drivers/media/platform/omap3isp/ispvideo.h
@@
-20,7
+20,7
@@
#include <media/media-entity.h>
#include <media/v4l2-dev.h>
#include <media/v4l2-fh.h>
#include <media/media-entity.h>
#include <media/v4l2-dev.h>
#include <media/v4l2-fh.h>
-#include <media/videobuf2-
core
.h>
+#include <media/videobuf2-
v4l2
.h>
#define ISP_VIDEO_DRIVER_NAME "ispvideo"
#define ISP_VIDEO_DRIVER_VERSION "0.0.2"
#define ISP_VIDEO_DRIVER_NAME "ispvideo"
#define ISP_VIDEO_DRIVER_VERSION "0.0.2"
@@
-122,7
+122,7
@@
static inline int isp_pipeline_ready(struct isp_pipeline *pipe)
* @dma: DMA address
*/
struct isp_buffer {
* @dma: DMA address
*/
struct isp_buffer {
- struct vb2_buffer vb;
+ struct vb2_
v4l2_
buffer vb;
struct list_head irqlist;
dma_addr_t dma;
};
struct list_head irqlist;
dma_addr_t dma;
};