---

yaml --- r: 235879 b: refs/heads/master c: a78392a h: refs/heads/master i: 235877: eac4cda 235875: f0924c6 235871: edcd418 v: v3
git-mirror · Feb 9, 2011 · 98da340 · 98da340
1 parent 6a2b01d
commit 98da340
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 16 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ae2dbec4d9673ae0935233e42dc890659702dfb
+refs/heads/master: a78392aa3458d93c81201bcc431f166d348cfac6
diff --git a/trunk/drivers/staging/easycap/easycap.h b/trunk/drivers/staging/easycap/easycap.h
@@ -33,7 +33,6 @@
  *                EASYCAP_NEEDS_USBVIDEO_H
  *                EASYCAP_NEEDS_V4L2_DEVICE_H
  *                EASYCAP_NEEDS_V4L2_FOPS
- *                EASYCAP_SILENT
  *
  *  IF REQUIRED THEY MUST BE EXTERNALLY DEFINED, FOR EXAMPLE AS COMPILER
  *  OPTIONS.

diff --git a/trunk/drivers/staging/easycap/easycap_low.c b/trunk/drivers/staging/easycap/easycap_low.c
@@ -133,11 +133,7 @@ static const struct saa7113config{
 	int set;
 } saa7113configPAL[256] = {
 		{0x01, 0x08},
-#ifdef ANTIALIAS
-		{0x02, 0xC0},
-#else
 		{0x02, 0x80},
-#endif /*ANTIALIAS*/
 		{0x03, 0x33},
 		{0x04, 0x00},
 		{0x05, 0x00},
@@ -191,11 +187,7 @@ static const struct saa7113config{
 /*--------------------------------------------------------------------------*/
 static const struct saa7113config saa7113configNTSC[256] = {
 		{0x01, 0x08},
-#ifdef ANTIALIAS
-		{0x02, 0xC0},
-#else
 		{0x02, 0x80},
-#endif /*ANTIALIAS*/
 		{0x03, 0x33},
 		{0x04, 0x00},
 		{0x05, 0x00},

diff --git a/trunk/drivers/staging/easycap/easycap_main.c b/trunk/drivers/staging/easycap/easycap_main.c
@@ -4188,9 +4188,6 @@ static int easycap_usb_probe(struct usb_interface *pusb_interface,
  */
 /*--------------------------------------------------------------------------*/
 	case 1: {
-#ifdef EASYCAP_SILENT
-		return -ENOENT;
-#endif /*EASYCAP_SILENT*/
 		if (!peasycap) {
 			SAM("MISTAKE: peasycap is NULL\n");
 			return -EFAULT;
@@ -4207,9 +4204,6 @@ static int easycap_usb_probe(struct usb_interface *pusb_interface,
 	}
 	/*--------------------------------------------------------------------------*/
 	case 2: {
-#ifdef EASYCAP_SILENT
-		return -ENOENT;
-#endif /*EASYCAP_SILENT*/
 		if (!peasycap) {
 			SAM("MISTAKE: peasycap is NULL\n");
 			return -EFAULT;