From 649f323037dbd835aaf73d42d5b3db3a23e5e4a1 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Sun, 20 Jul 2008 20:26:54 -0300
Subject: [PATCH] --- yaml --- r: 106702 b: refs/heads/master c:
 2864462eaf027ff10c1df1ce57d3518332e9083c h: refs/heads/master v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/media/video/compat_ioctl32.c |  2 +-
 trunk/drivers/media/video/stradis.c        |  1 +
 trunk/drivers/media/video/w9968cf.c        |  1 +
 trunk/include/media/v4l2-common.h          | 22 ----------------------
 trunk/include/media/v4l2-ioctl.h           | 21 +++++++++++++++++++++
 6 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/[refs] b/[refs]
index 40af1c1a0421..77794f47a38e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35ea11ff84719b1bfab2909903a9640a86552fd1
+refs/heads/master: 2864462eaf027ff10c1df1ce57d3518332e9083c
diff --git a/trunk/drivers/media/video/compat_ioctl32.c b/trunk/drivers/media/video/compat_ioctl32.c
index 54de0cd482e9..bd5d9de5a008 100644
--- a/trunk/drivers/media/video/compat_ioctl32.c
+++ b/trunk/drivers/media/video/compat_ioctl32.c
@@ -17,7 +17,7 @@
 #include <linux/videodev2.h>
 #include <linux/module.h>
 #include <linux/smp_lock.h>
-#include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 
 #ifdef CONFIG_COMPAT
 
diff --git a/trunk/drivers/media/video/stradis.c b/trunk/drivers/media/video/stradis.c
index c109511f21ea..6ace8923b797 100644
--- a/trunk/drivers/media/video/stradis.c
+++ b/trunk/drivers/media/video/stradis.c
@@ -43,6 +43,7 @@
 #include <linux/vmalloc.h>
 #include <linux/videodev.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 
 #include "saa7146.h"
 #include "saa7146reg.h"
diff --git a/trunk/drivers/media/video/w9968cf.c b/trunk/drivers/media/video/w9968cf.c
index 3f5a59dc5f8f..56bbeec542c5 100644
--- a/trunk/drivers/media/video/w9968cf.c
+++ b/trunk/drivers/media/video/w9968cf.c
@@ -42,6 +42,7 @@
 #include <asm/page.h>
 #include <asm/uaccess.h>
 #include <linux/page-flags.h>
+#include <media/v4l2-ioctl.h>
 
 #include "w9968cf.h"
 #include "w9968cf_decoder.h"
diff --git a/trunk/include/media/v4l2-common.h b/trunk/include/media/v4l2-common.h
index 8bbb526a5a24..07d3a9a575d1 100644
--- a/trunk/include/media/v4l2-common.h
+++ b/trunk/include/media/v4l2-common.h
@@ -28,12 +28,6 @@
 
 #include <media/v4l2-dev.h>
 
-/* v4l debugging and diagnostics */
-
-/* Debug bitmask flags to be used on V4L2 */
-#define V4L2_DEBUG_IOCTL     0x01
-#define V4L2_DEBUG_IOCTL_ARG 0x02
-
 /* Common printk constucts for v4l-i2c drivers. These macros create a unique
    prefix consisting of the driver name, the adapter number and the i2c
    address. */
@@ -61,22 +55,6 @@
 			v4l_client_printk(KERN_DEBUG, client, fmt , ## arg); \
 	} while (0)
 
-
-/* Use this macro for non-I2C drivers. Pass the driver name as the first arg. */
-#define v4l_print_ioctl(name, cmd)  		 \
-	do {  					 \
-		printk(KERN_DEBUG "%s: ", name); \
-		v4l_printk_ioctl(cmd);		 \
-	} while (0)
-
-/* Use this macro in I2C drivers where 'client' is the struct i2c_client
-   pointer */
-#define v4l_i2c_print_ioctl(client, cmd) 		   \
-	do {      					   \
-		v4l_client_printk(KERN_DEBUG, client, ""); \
-		v4l_printk_ioctl(cmd);			   \
-	} while (0)
-
 /* ------------------------------------------------------------------------- */
 
 /* Priority helper functions */
diff --git a/trunk/include/media/v4l2-ioctl.h b/trunk/include/media/v4l2-ioctl.h
index 685b1b62a054..e319d1fffb82 100644
--- a/trunk/include/media/v4l2-ioctl.h
+++ b/trunk/include/media/v4l2-ioctl.h
@@ -20,6 +20,27 @@
 #include <linux/videodev2.h>
 #endif
 
+/* v4l debugging and diagnostics */
+
+/* Debug bitmask flags to be used on V4L2 */
+#define V4L2_DEBUG_IOCTL     0x01
+#define V4L2_DEBUG_IOCTL_ARG 0x02
+
+/* Use this macro for non-I2C drivers. Pass the driver name as the first arg. */
+#define v4l_print_ioctl(name, cmd)  		 \
+	do {  					 \
+		printk(KERN_DEBUG "%s: ", name); \
+		v4l_printk_ioctl(cmd);		 \
+	} while (0)
+
+/* Use this macro in I2C drivers where 'client' is the struct i2c_client
+   pointer */
+#define v4l_i2c_print_ioctl(client, cmd) 		   \
+	do {      					   \
+		v4l_client_printk(KERN_DEBUG, client, ""); \
+		v4l_printk_ioctl(cmd);			   \
+	} while (0)
+
 /*  Video standard functions  */
 extern const char *v4l2_norm_to_name(v4l2_std_id id);
 extern int v4l2_video_std_construct(struct v4l2_standard *vs,