From 504466d9db4e4201009a5fc3d3dea79b64481354 Mon Sep 17 00:00:00 2001
From: Tomas Winkler <tomas.winkler@intel.com>
Date: Mon, 24 Jan 2011 13:27:00 +0200
Subject: [PATCH] --- yaml --- r: 235706 b: refs/heads/master c:
 e86ba1162f1f6d292d4901c8716a233632c3a783 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index d52845f06992..b43dc3bdccf7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 03389996e086fe61216692f0a2bb445051082902
+refs/heads/master: e86ba1162f1f6d292d4901c8716a233632c3a783
diff --git a/trunk/drivers/staging/easycap/easycap_ioctl.c b/trunk/drivers/staging/easycap/easycap_ioctl.c
index bb2ee315c0ec..43891039e7bf 100644
--- a/trunk/drivers/staging/easycap/easycap_ioctl.c
+++ b/trunk/drivers/staging/easycap/easycap_ioctl.c
@@ -2519,7 +2519,7 @@ return 0;
 /*****************************************************************************/
 #if !defined(EASYCAP_NEEDS_ALSA)
 /*vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/
-#if ((defined(EASYCAP_IS_VIDEODEV_CLIENT)) ||
+#if ((defined(EASYCAP_IS_VIDEODEV_CLIENT)) || \
 	(defined(EASYCAP_NEEDS_UNLOCKED_IOCTL)))
 long
 easyoss_ioctl_noinode(struct file *file, unsigned int cmd, unsigned long arg) {