Merge tag 'iwlwifi-next-for-kalle-2015-09-21' of git://git.kernel.org/pub/scm/linux...

[firefly-linux-kernel-4.4.55.git] / drivers / media / usb / stk1160 / stk1160.h

diff --git a/drivers/media/usb/stk1160/stk1160.h b/drivers/media/usb/stk1160/stk1160.h
index abdea484c9987ad25dcaff6e4582881522e5f68d..72cc8e8cbef78f8ffbc22c43aefa71f6923b54b1 100644 (file)
--- a/drivers/media/usb/stk1160/stk1160.h
+++ b/drivers/media/usb/stk1160/stk1160.h
@@ -58,7 +58,6 @@
  * new drivers should use.
  *
  */
-#define DEBUG
 #ifdef DEBUG
 #define stk1160_dbg(fmt, args...) \
        printk(KERN_DEBUG "stk1160: " fmt,  ## args)
@@ -151,8 +150,7 @@ struct stk1160 {
        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;