From eac4cda0373d6cc3e446c024cb3bc82fac7ef231 Mon Sep 17 00:00:00 2001
From: Tomas Winkler <tomas.winkler@intel.com>
Date: Wed, 9 Feb 2011 01:12:44 +0200
Subject: [PATCH] --- yaml --- r: 235877 b: refs/heads/master c:
 f62bc44e055712fc8ccf34654a79137dd4a4d8af h: refs/heads/master i:   235875:
 f0924c6a0816ee99d2f0756563fa9513eb33c290 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/staging/easycap/easycap_ioctl.c | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 47c5db24efcb..74c734ec46f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5dd00908be5220477993002896a8c382fa67681a
+refs/heads/master: f62bc44e055712fc8ccf34654a79137dd4a4d8af
diff --git a/trunk/drivers/staging/easycap/easycap_ioctl.c b/trunk/drivers/staging/easycap/easycap_ioctl.c
index a5c6d8ef4f07..cbcf3944732c 100644
--- a/trunk/drivers/staging/easycap/easycap_ioctl.c
+++ b/trunk/drivers/staging/easycap/easycap_ioctl.c
@@ -1387,11 +1387,6 @@ case VIDIOC_G_CTRL: {
 	break;
 }
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
-#ifdef VIDIOC_S_CTRL_OLD
-case VIDIOC_S_CTRL_OLD: {
-	JOM(8, "VIDIOC_S_CTRL_OLD required at least for xawtv\n");
-}
-#endif /*VIDIOC_S_CTRL_OLD*/
 case VIDIOC_S_CTRL:
 	{
 	struct v4l2_control v4l2_control;