Merge git://git.infradead.org/battery-2.6

[~andy/linux] / drivers / media / rc / ir-raw.c

diff --git a/drivers/media/rc/ir-raw.c b/drivers/media/rc/ir-raw.c
index 423ed45d6c55a4e3ccb43f3ae1284bcf55d952da..27808bb59eba3874ee7c1c07f79ba67f82abfd78 100644 (file)
--- a/drivers/media/rc/ir-raw.c
+++ b/drivers/media/rc/ir-raw.c
@@ -355,6 +355,7 @@ static void init_decoders(struct work_struct *work)
        load_rc6_decode();
        load_jvc_decode();
        load_sony_decode();
+       load_mce_kbd_decode();
        load_lirc_codec();
 
        /* If needed, we may later add some init code. In this case,