[media] mce_kbd: add encoder

[karo-tx-linux.git] / drivers / media / rc / rc-main.c

diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index 2424946740e64fb602f55a30d5f158a212cc88ce..b189f24c0fed6a755ca8b8b3a2b6398c840e5a5a 100644 (file)
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@ -746,6 +746,8 @@ static int rc_validate_filter(struct rc_dev *dev,
                [RC_TYPE_NECX] = 0xffffff,
                [RC_TYPE_NEC32] = 0xffffffff,
                [RC_TYPE_SANYO] = 0x1fffff,
+               [RC_TYPE_MCIR2_KBD] = 0xffff,
+               [RC_TYPE_MCIR2_MSE] = 0x1fffff,
                [RC_TYPE_RC6_0] = 0xffff,
                [RC_TYPE_RC6_6A_20] = 0xfffff,
                [RC_TYPE_RC6_6A_24] = 0xffffff,
@@ -878,7 +880,8 @@ static const struct {
        { RC_BIT_RC5_SZ,        "rc-5-sz",      "ir-rc5-decoder"        },
        { RC_BIT_SANYO,         "sanyo",        "ir-sanyo-decoder"      },
        { RC_BIT_SHARP,         "sharp",        "ir-sharp-decoder"      },
-       { RC_BIT_MCE_KBD,       "mce_kbd",      "ir-mce_kbd-decoder"    },
+       { RC_BIT_MCIR2_KBD |
+         RC_BIT_MCIR2_MSE,     "mce_kbd",      "ir-mce_kbd-decoder"    },
        { RC_BIT_XMP,           "xmp",          "ir-xmp-decoder"        },
        { RC_BIT_CEC,           "cec",          NULL                    },
 };
@@ -1346,7 +1349,8 @@ static const char * const proto_variant_names[] = {
        [RC_TYPE_NECX] = "nec-x",
        [RC_TYPE_NEC32] = "nec-32",
        [RC_TYPE_SANYO] = "sanyo",
-       [RC_TYPE_MCE_KBD] = "mce_kbd",
+       [RC_TYPE_MCIR2_KBD] = "mcir2-kbd",
+       [RC_TYPE_MCIR2_MSE] = "mcir2-mse",
        [RC_TYPE_RC6_0] = "rc-6-0",
        [RC_TYPE_RC6_6A_20] = "rc-6-6a-20",
        [RC_TYPE_RC6_6A_24] = "rc-6-6a-24",