From c3ebe0f75fcfe5d4c7eb697c756a0ba7bb555ca7 Mon Sep 17 00:00:00 2001
From: Anton Blanchard <anton@samba.org>
Date: Sun, 1 Jul 2012 21:58:00 -0300
Subject: [PATCH] --- yaml --- r: 311898 b: refs/heads/master c:
 57f4422f7bd83bb0a092e3f9aea0d9c8ac59045e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 4d282a78f509..69cce2e4bfe6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6cff169268bba9de687acf317ac24aa038cc263
+refs/heads/master: 57f4422f7bd83bb0a092e3f9aea0d9c8ac59045e
diff --git a/trunk/drivers/media/rc/winbond-cir.c b/trunk/drivers/media/rc/winbond-cir.c
index 342c2c8c1ddf..eca17b564cc2 100644
--- a/trunk/drivers/media/rc/winbond-cir.c
+++ b/trunk/drivers/media/rc/winbond-cir.c
@@ -232,7 +232,7 @@ MODULE_PARM_DESC(invert, "Invert the signal from the IR receiver");
 
 static bool txandrx; /* default = 0 */
 module_param(txandrx, bool, 0444);
-MODULE_PARM_DESC(invert, "Allow simultaneous TX and RX");
+MODULE_PARM_DESC(txandrx, "Allow simultaneous TX and RX");
 
 static unsigned int wake_sc = 0x800F040C;
 module_param(wake_sc, uint, 0644);