From 49a07aaefadf59e09a81ee43ce8c36668a30d710 Mon Sep 17 00:00:00 2001
From: Sean Young <sean@mess.org>
Date: Wed, 17 Oct 2012 11:38:21 -0300
Subject: [PATCH] --- yaml --- r: 343871 b: refs/heads/master c:
 a66cd0b691c730ed751dbf66ffbd0edf18241790 h: refs/heads/master i:   343869:
 225d7199e7cbebed5902e6fc9bea498e491ae7b8   343867:
 a6712ad2742f077677c4a9b6372be6e3a00f6385   343863:
 a97f2429c5d11217bf1994c961dddeb27dd2cb31   343855:
 be52e049400b0ae7b6cd562bf31c9edb4fcade5a   343839:
 dcc8595df5bc7dc1d45a0850c6cee1da50c60345   343807:
 4a3886f640c2434479bd348672f6d5b694b9ee05 v: v3

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

diff --git a/[refs] b/[refs]
index 1b0d2f6d1e30..2e13fabfcb34 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 107376ba4ef1ecd4249427a9f9c1922fc1d66bb4
+refs/heads/master: a66cd0b691c730ed751dbf66ffbd0edf18241790
diff --git a/trunk/drivers/media/rc/winbond-cir.c b/trunk/drivers/media/rc/winbond-cir.c
index 569d8863f439..45d2fff764bc 100644
--- a/trunk/drivers/media/rc/winbond-cir.c
+++ b/trunk/drivers/media/rc/winbond-cir.c
@@ -184,7 +184,7 @@ enum wbcir_txstate {
 };
 
 /* Misc */
-#define WBCIR_NAME	"winbond-cir"
+#define WBCIR_NAME	"Winbond CIR"
 #define WBCIR_ID_FAMILY          0xF1 /* Family ID for the WPCD376I	*/
 #define	WBCIR_ID_CHIP            0x04 /* Chip ID for the WPCD376I	*/
 #define INVALID_SCANCODE   0x7FFFFFFF /* Invalid with all protos	*/
@@ -1007,7 +1007,7 @@ wbcir_probe(struct pnp_dev *device, const struct pnp_device_id *dev_id)
 	}
 
 	data->dev->driver_type = RC_DRIVER_IR_RAW;
-	data->dev->driver_name = WBCIR_NAME;
+	data->dev->driver_name = DRVNAME;
 	data->dev->input_name = WBCIR_NAME;
 	data->dev->input_phys = "wbcir/cir0";
 	data->dev->input_id.bustype = BUS_HOST;