Merge l2-mtd/next into l2-mtd/master

[firefly-linux-kernel-4.4.55.git] / include / media / saa6588.h

diff --git a/include/media/saa6588.h b/include/media/saa6588.h
index 2c3c4420a4eb61e42ed0cd8c8606b5a8a32766cd..b5ec1aa60ed552337493d63dda4f3fb0382b5e78 100644 (file)
--- a/include/media/saa6588.h
+++ b/include/media/saa6588.h
@@ -27,6 +27,7 @@
 
 struct saa6588_command {
        unsigned int  block_count;
+       bool          nonblocking;
        int           result;
        unsigned char __user *buffer;
        struct file   *instance;
@@ -34,7 +35,6 @@ struct saa6588_command {
 };
 
 /* These ioctls are internal to the kernel */
-#define SAA6588_CMD_OPEN       _IOW('R', 1, int)
 #define SAA6588_CMD_CLOSE      _IOW('R', 2, int)
 #define SAA6588_CMD_READ       _IOR('R', 3, int)
 #define SAA6588_CMD_POLL       _IOR('R', 4, int)