From f0924c6a0816ee99d2f0756563fa9513eb33c290 Mon Sep 17 00:00:00 2001
From: Tomas Winkler <tomas.winkler@intel.com>
Date: Wed, 9 Feb 2011 01:12:42 +0200
Subject: [PATCH] --- yaml --- r: 235875 b: refs/heads/master c:
 8d6139547ca349f9acea6536dd6b7f6140d3507f h: refs/heads/master i:   235873:
 744a2e4d4498bc2ee4812f46cd7cd8e874ede945   235871:
 edcd418b475f7759aa2aaa628df7b4c6a66040ae v: v3

---
 [refs]                                       |  2 +-
 trunk/drivers/staging/easycap/easycap.h      |  1 -
 trunk/drivers/staging/easycap/easycap_main.c | 14 +++++++-------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 2a7e1eb3e4f1..3d6644fd14ad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aff512c8a4582c7f74af57bb09a9979edf92b6d8
+refs/heads/master: 8d6139547ca349f9acea6536dd6b7f6140d3507f
diff --git a/trunk/drivers/staging/easycap/easycap.h b/trunk/drivers/staging/easycap/easycap.h
index da77e3ee6230..00669b60aa42 100644
--- a/trunk/drivers/staging/easycap/easycap.h
+++ b/trunk/drivers/staging/easycap/easycap.h
@@ -49,7 +49,6 @@
  */
 /*---------------------------------------------------------------------------*/
 #define  PATIENCE  500
-#undef   PREFER_NTSC
 #define  PERSEVERE
 /*---------------------------------------------------------------------------*/
 /*
diff --git a/trunk/drivers/staging/easycap/easycap_main.c b/trunk/drivers/staging/easycap/easycap_main.c
index 4385236b2883..2887f014274b 100644
--- a/trunk/drivers/staging/easycap/easycap_main.c
+++ b/trunk/drivers/staging/easycap/easycap_main.c
@@ -51,6 +51,10 @@ static int easycap_gain = 16;
 module_param_named(gain, easycap_gain, int, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(gain, "Audio gain: 0,...,16(default),...31");
 
+static bool easycap_ntsc;
+module_param_named(ntsc, easycap_ntsc, bool, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(ntsc, "NTCS default encoding (default PAL)");
+
 
 
 struct easycap_dongle easycapdc60_dongle[DONGLE_MANY];
@@ -4102,13 +4106,9 @@ static int easycap_usb_probe(struct usb_interface *pusb_interface,
  *  BEWARE.
 */
 /*---------------------------------------------------------------------------*/
-#ifdef PREFER_NTSC
-		peasycap->ntsc = true;
-		JOM(8, "defaulting initially to NTSC\n");
-#else
-		peasycap->ntsc = false;
-		JOM(8, "defaulting initially to PAL\n");
-#endif /*PREFER_NTSC*/
+		peasycap->ntsc = easycap_ntsc;
+		JOM(8, "defaulting initially to %s\n",
+			easycap_ntsc ? "NTSC" : "PAL");
 		rc = reset(peasycap);
 		if (rc) {
 			SAM("ERROR: reset() returned %i\n", rc);