From f7ccb920618291fc00150c1d153ed78327ff3153 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jarod@redhat.com>
Date: Tue, 19 Apr 2011 16:47:34 -0300
Subject: [PATCH] --- yaml --- r: 250167 b: refs/heads/master c:
 2faa0ca82c7180f58a4b3bb3c460e5bdcdcf04c6 h: refs/heads/master i:   250165:
 da0d63621641ac4237d44630ccfca1c16f6ce1ed   250163:
 79a81a12ba0a43ccf05101815cbf1d05d7ddab20   250159:
 f1a88a2cc79a10e16440aa66aef12e8c3e8ddc11 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/media/rc/mceusb.c | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 98848a4cd602..6db66d2b4f20 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39381d4fcd97462f0262bef382b7643f17787587
+refs/heads/master: 2faa0ca82c7180f58a4b3bb3c460e5bdcdcf04c6
diff --git a/trunk/drivers/media/rc/mceusb.c b/trunk/drivers/media/rc/mceusb.c
index 9145be9c0f04..5edd2cb8128a 100644
--- a/trunk/drivers/media/rc/mceusb.c
+++ b/trunk/drivers/media/rc/mceusb.c
@@ -150,6 +150,7 @@ enum mceusb_model_type {
 	CX_HYBRID_TV,
 	MULTIFUNCTION,
 	TIVO_KIT,
+	MCE_GEN2_NO_TX,
 };
 
 struct mceusb_model {
@@ -173,6 +174,10 @@ static const struct mceusb_model mceusb_model[] = {
 	[MCE_GEN2] = {
 		.mce_gen2 = 1,
 	},
+	[MCE_GEN2_NO_TX] = {
+		.mce_gen2 = 1,
+		.no_tx = 1,
+	},
 	[MCE_GEN2_TX_INV] = {
 		.mce_gen2 = 1,
 		.tx_mask_normal = 1,
@@ -284,7 +289,8 @@ static struct usb_device_id mceusb_dev_table[] = {
 	/* Formosa21 / eHome Infrared Receiver */
 	{ USB_DEVICE(VENDOR_FORMOSA, 0xe016) },
 	/* Formosa aim / Trust MCE Infrared Receiver */
-	{ USB_DEVICE(VENDOR_FORMOSA, 0xe017) },
+	{ USB_DEVICE(VENDOR_FORMOSA, 0xe017),
+	  .driver_info = MCE_GEN2_NO_TX },
 	/* Formosa Industrial Computing / Beanbag Emulation Device */
 	{ USB_DEVICE(VENDOR_FORMOSA, 0xe018) },
 	/* Formosa21 / eHome Infrared Receiver */