diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-10-30 06:12:50 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-10-30 06:12:50 +0100 |
| commit | fe0f59c41255d339f4f059be62c350c3c48a3f95 (patch) | |
| tree | fde2381bf94a14ea1553f88f9e9e37b45ed280dc /drivers/media/rc/ir-rc6-decoder.c | |
| parent | cpufreq: intel_pstate: Always set max P-state in performance mode (diff) | |
| parent | Documentation: intel_pstate: PID tuning is not always available (diff) | |
| download | linux-fe0f59c41255d339f4f059be62c350c3c48a3f95.tar.xz linux-fe0f59c41255d339f4f059be62c350c3c48a3f95.zip | |
Merge back earlier cpufreq material for v4.10.
Diffstat (limited to 'drivers/media/rc/ir-rc6-decoder.c')
| -rw-r--r-- | drivers/media/rc/ir-rc6-decoder.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/rc/ir-rc6-decoder.c b/drivers/media/rc/ir-rc6-decoder.c index e0e2edefa651..5cc54c967a80 100644 --- a/drivers/media/rc/ir-rc6-decoder.c +++ b/drivers/media/rc/ir-rc6-decoder.c @@ -248,7 +248,7 @@ again: toggle = 0; break; case 24: - protocol = RC_BIT_RC6_6A_24; + protocol = RC_TYPE_RC6_6A_24; toggle = 0; break; case 32: @@ -257,7 +257,7 @@ again: toggle = !!(scancode & RC6_6A_MCE_TOGGLE_MASK); scancode &= ~RC6_6A_MCE_TOGGLE_MASK; } else { - protocol = RC_BIT_RC6_6A_32; + protocol = RC_TYPE_RC6_6A_32; toggle = 0; } break; |