Merge branches 'stable/bug.fixes-3.2' and 'stable/mmu.fixes' of git://git.kernel...

[~andy/linux] / drivers / media / rc / ir-rc5-sz-decoder.c

diff --git a/drivers/media/rc/ir-rc5-sz-decoder.c b/drivers/media/rc/ir-rc5-sz-decoder.c
index 5586bf20c8d7738e9b2553b9338789a6697a1542..90aa8868629adccee354300504fe53fd9f5131ed 100644 (file)
--- a/drivers/media/rc/ir-rc5-sz-decoder.c
+++ b/drivers/media/rc/ir-rc5-sz-decoder.c
@@ -47,7 +47,7 @@ static int ir_rc5_sz_decode(struct rc_dev *dev, struct ir_raw_event ev)
        u8 toggle, command, system;
        u32 scancode;
 
-        if (!(dev->raw->enabled_protocols & IR_TYPE_RC5_SZ))
+        if (!(dev->raw->enabled_protocols & RC_TYPE_RC5_SZ))
                 return 0;
 
        if (!is_timing_event(ev)) {
@@ -127,7 +127,7 @@ out:
 }
 
 static struct ir_raw_handler rc5_sz_handler = {
-       .protocols      = IR_TYPE_RC5_SZ,
+       .protocols      = RC_TYPE_RC5_SZ,
        .decode         = ir_rc5_sz_decode,
 };