diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2018-03-18 17:48:59 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2018-03-18 17:48:59 +0100 |
| commit | 95260c17b27e4bdacf85022e629fb701b42cc190 (patch) | |
| tree | cfc6963180d99e5f36752ca028821aaa109e860d /drivers/cpufreq/speedstep-centrino.c | |
| parent | 4f9a4cd66c1201ce2b26ba895b2be63b8b38bb68 (diff) | |
| parent | 0c8efd610b58cb23cefdfa12015799079aef94ae (diff) | |
| download | op-kernel-dev-95260c17b27e4bdacf85022e629fb701b42cc190.zip op-kernel-dev-95260c17b27e4bdacf85022e629fb701b42cc190.tar.gz | |
Merge tag 'v4.16-rc5' into devel
Linux 4.16-rc5 merged into the GPIO devel branch to resolve
a nasty conflict between fixes and devel in the RCAR driver.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/cpufreq/speedstep-centrino.c')
| -rw-r--r-- | drivers/cpufreq/speedstep-centrino.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/cpufreq/speedstep-centrino.c b/drivers/cpufreq/speedstep-centrino.c index 41bc539..4fa5adf 100644 --- a/drivers/cpufreq/speedstep-centrino.c +++ b/drivers/cpufreq/speedstep-centrino.c @@ -37,7 +37,7 @@ struct cpu_id { __u8 x86; /* CPU family */ __u8 x86_model; /* model */ - __u8 x86_mask; /* stepping */ + __u8 x86_stepping; /* stepping */ }; enum { @@ -277,7 +277,7 @@ static int centrino_verify_cpu_id(const struct cpuinfo_x86 *c, { if ((c->x86 == x->x86) && (c->x86_model == x->x86_model) && - (c->x86_mask == x->x86_mask)) + (c->x86_stepping == x->x86_stepping)) return 1; return 0; } |
