From 510fe0a208e939ca9e816577583703a129631e9f Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Fri, 2 Oct 2009 08:47:22 -0300
Subject: [PATCH] --- yaml --- r: 174015 b: refs/heads/master c:
 aef02aa1e2593b39f808b2b8ae928699087b96dc h: refs/heads/master i:   174013:
 bc5e62373fe96c68c65a3dcf499dfd4a804617bf   174011:
 79bdd0ced7f1a70dbb9242b33e28cfac81081e2d   174007:
 c7d54fcc9a0f5edfaa8ea91a84c474ea20a7b2f1   173999:
 6a0478df1794cf12fa17cef33f4115f8222cd962   173983:
 18a91f27db33c55e8b94a2b1643fb81a72cc6f19   173951:
 008969c12ce2f37bf8820a529a35b9fb7fe7ca82 v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/media/video/saa7134/saa7134-input.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 324cc6ace783..9db0f8e79fd0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43e16ea241cab1f4d4206307b2f6eacbaf4dc335
+refs/heads/master: aef02aa1e2593b39f808b2b8ae928699087b96dc
diff --git a/trunk/drivers/media/video/saa7134/saa7134-input.c b/trunk/drivers/media/video/saa7134/saa7134-input.c
index bcb65e93edca..c3b5cfa13b60 100644
--- a/trunk/drivers/media/video/saa7134/saa7134-input.c
+++ b/trunk/drivers/media/video/saa7134/saa7134-input.c
@@ -697,7 +697,7 @@ void saa7134_probe_i2c_ir(struct saa7134_dev *dev)
 {
 	struct i2c_board_info info;
 	const unsigned short addr_list[] = {
-		0x7a, 0x47, 0x71, 0x2d,
+		0x47, 0x71, 0x2d,
 		I2C_CLIENT_END
 	};
 
@@ -737,6 +737,7 @@ void saa7134_probe_i2c_ir(struct saa7134_dev *dev)
 		dev->init_data.name = "Purple TV";
 		dev->init_data.get_key = get_key_purpletv;
 		dev->init_data.ir_codes = &ir_codes_purpletv_table;
+		info.addr = 0x7a;
 		break;
 	case SAA7134_BOARD_MSI_TVATANYWHERE_PLUS:
 		dev->init_data.name = "MSI TV@nywhere Plus";