Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
staging
/
media
/
omap4iss
/
iss_video.h
diff --git
a/kernel/drivers/staging/media/omap4iss/iss_video.h
b/kernel/drivers/staging/media/omap4iss/iss_video.h
index
f11fce2
..
41532ed
100644
(file)
--- a/
kernel/drivers/staging/media/omap4iss/iss_video.h
+++ b/
kernel/drivers/staging/media/omap4iss/iss_video.h
@@
-18,7
+18,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>
#include <media/videobuf2-dma-contig.h>
#define ISS_VIDEO_DRIVER_NAME "issvideo"
#include <media/videobuf2-dma-contig.h>
#define ISS_VIDEO_DRIVER_NAME "issvideo"
@@
-117,12
+117,12
@@
static inline int iss_pipeline_ready(struct iss_pipeline *pipe)
*/
struct iss_buffer {
/* common v4l buffer stuff -- must be first */
*/
struct iss_buffer {
/* common v4l buffer stuff -- must be first */
- struct vb2_
buffer
vb;
+ struct vb2_
v4l2_buffer
vb;
struct list_head list;
dma_addr_t iss_addr;
};
struct list_head list;
dma_addr_t iss_addr;
};
-#define to_iss_buffer(buf) container_of(buf, struct iss_buffer,
buffer
)
+#define to_iss_buffer(buf) container_of(buf, struct iss_buffer,
vb
)
enum iss_video_dmaqueue_flags {
/* Set if DMA queue becomes empty when ISS_PIPELINE_STREAM_CONTINUOUS */
enum iss_video_dmaqueue_flags {
/* Set if DMA queue becomes empty when ISS_PIPELINE_STREAM_CONTINUOUS */