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
/
media
/
usb
/
stk1160
/
stk1160.h
diff --git
a/kernel/drivers/media/usb/stk1160/stk1160.h
b/kernel/drivers/media/usb/stk1160/stk1160.h
index
abdea48
..
1ed1cc4
100644
(file)
--- a/
kernel/drivers/media/usb/stk1160/stk1160.h
+++ b/
kernel/drivers/media/usb/stk1160/stk1160.h
@@
-23,7
+23,7
@@
#include <linux/i2c.h>
#include <sound/core.h>
#include <sound/ac97_codec.h>
#include <linux/i2c.h>
#include <sound/core.h>
#include <sound/ac97_codec.h>
-#include <media/videobuf2-
core
.h>
+#include <media/videobuf2-
v4l2
.h>
#include <media/v4l2-device.h>
#include <media/v4l2-ctrls.h>
#include <media/v4l2-device.h>
#include <media/v4l2-ctrls.h>
@@
-58,7
+58,6
@@
* new drivers should use.
*
*/
* new drivers should use.
*
*/
-#define DEBUG
#ifdef DEBUG
#define stk1160_dbg(fmt, args...) \
printk(KERN_DEBUG "stk1160: " fmt, ## args)
#ifdef DEBUG
#define stk1160_dbg(fmt, args...) \
printk(KERN_DEBUG "stk1160: " fmt, ## args)
@@
-78,7
+77,7
@@
/* Buffer for one video frame */
struct stk1160_buffer {
/* common v4l buffer stuff -- must be first */
/* Buffer for one video frame */
struct stk1160_buffer {
/* common v4l buffer stuff -- must be first */
- struct vb2_buffer vb;
+ struct vb2_
v4l2_
buffer vb;
struct list_head list;
void *mem;
struct list_head list;
void *mem;
@@
-151,8
+150,7
@@
struct stk1160 {
v4l2_std_id norm; /* current norm */
struct stk1160_fmt *fmt; /* selected format */
v4l2_std_id norm; /* current norm */
struct stk1160_fmt *fmt; /* selected format */
- unsigned int field_count; /* not sure ??? */
- enum v4l2_field field; /* also not sure :/ */
+ unsigned int sequence;
/* i2c i/o */
struct i2c_adapter i2c_adap;
/* i2c i/o */
struct i2c_adapter i2c_adap;