From 5631c66fdb3f9309c994787ca977cbe8c57e7937 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Thu, 31 Jan 2008 13:15:52 -0300
Subject: [PATCH] --- yaml --- r: 85707 b: refs/heads/master c:
 1a4e30c3eaffb83218977477bb83d54316844acb h: refs/heads/master i:   85705:
 c69561601e4e91c4d7947494e5805770cbb2e48c   85703:
 c659ad30a1bc533e37f3a0e4415b9927fec76b75 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/media/video/v4l2-common.c | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index abd650743ba5..51154f011c46 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a9254475bbfbed5f0596d952c6a3c9806e19dd0b
+refs/heads/master: 1a4e30c3eaffb83218977477bb83d54316844acb
diff --git a/trunk/drivers/media/video/v4l2-common.c b/trunk/drivers/media/video/v4l2-common.c
index 74d0a5996697..4a8fc170138b 100644
--- a/trunk/drivers/media/video/v4l2-common.c
+++ b/trunk/drivers/media/video/v4l2-common.c
@@ -81,7 +81,6 @@ MODULE_LICENSE("GPL");
  *  Video Standard Operations (contributed by Michael Schimek)
  */
 
-
 char *v4l2_norm_to_name(v4l2_std_id id)
 {
 	char *name;
@@ -270,9 +269,6 @@ char *v4l2_type_names[] = {
 	[V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY] = "video-out-over",
 };
 
-
-#define prt_names(a,arr) (((a)>=0)&&((a)<ARRAY_SIZE(arr)))?arr[a]:"unknown"
-
 /* ------------------------------------------------------------------ */
 /* debug help functions                                               */
 
@@ -421,7 +417,6 @@ static const char *v4l2_int_ioctls[] = {
 };
 #define V4L2_INT_IOCTLS ARRAY_SIZE(v4l2_int_ioctls)
 
-
 /* Common ioctl debug function. This function can be used by
    external ioctl messages as well as internal V4L ioctl */
 void v4l_printk_ioctl(unsigned int cmd)
@@ -460,7 +455,6 @@ void v4l_printk_ioctl(unsigned int cmd)
 	}
 }
 
-
 /* ----------------------------------------------------------------- */
 
 /* Helper functions for control handling			     */