---

yaml --- r: 25174 b: refs/heads/master c: c097b04 h: refs/heads/master v: v3
git-mirror · Apr 2, 2006 · 86cede2 · 86cede2
1 parent 9d92070
commit 86cede2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0020d3ef915fc01a0184bc96eeb3c240bded5d8e
+refs/heads/master: c097b04520a3ab69a94f63f3f1d6716864c07300
diff --git a/trunk/drivers/media/video/ir-kbd-i2c.c b/trunk/drivers/media/video/ir-kbd-i2c.c
@@ -400,7 +400,6 @@ static int ir_probe(struct i2c_adapter *adap)
 	*/
 
 	static const int probe_bttv[] = { 0x1a, 0x18, 0x4b, 0x64, 0x30, -1};
-	static const int probe_cx2341x[] = { 0x18, 0x7a, -1};
 	static const int probe_saa7134[] = { 0x7a, 0x47, -1 };
 	static const int probe_em28XX[] = { 0x30, 0x47, -1 };
 	const int *probe = NULL;
@@ -413,7 +412,7 @@ static int ir_probe(struct i2c_adapter *adap)
 		probe = probe_bttv;
 		break;
 	case I2C_HW_B_CX2341X:
-		probe = probe_cx2341x;
+		probe = probe_bttv;
 		break;
 	case I2C_HW_SAA7134:
 		probe = probe_saa7134;