From: Tomas Winkler <tomas.winkler@xxxxxxxxx>
remove PREFER_NTSC ifdef as it cannot be possible put into Kconfig
Cc: Mike Thomas <rmthomas@xxxxxxxxxxx>
Signed-off-by: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
---
drivers/staging/easycap/easycap.h | 1 -
drivers/staging/easycap/easycap_main.c | 14 +++++++-------
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/easycap/easycap.h b/drivers/staging/easycap/easycap.h
index da77e3e..00669b6 100644
--- a/drivers/staging/easycap/easycap.h
+++ b/drivers/staging/easycap/easycap.h
@@ -49,7 +49,6 @@
*/
/*---------------------------------------------------------------------------*/
#define PATIENCE 500
-#undef PREFER_NTSC
#define PERSEVERE
/*---------------------------------------------------------------------------*/
/*
diff --git a/drivers/staging/easycap/easycap_main.c b/drivers/staging/easycap/easycap_main.c
index 4385236..2887f01 100644
--- a/drivers/staging/easycap/easycap_main.c
+++ b/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);
--
1.7.4.1
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
