diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
| commit | 0cb7bf61b1e9f05027de58c80f9b46a714d24e35 (patch) | |
| tree | 41fb55cf62d07b425122f9a8b96412c0d8eb99c5 /drivers/hwmon/it87.c | |
| parent | aa877175e7a9982233ed8f10cb4bfddd78d82741 (diff) | |
| parent | 3eab887a55424fc2c27553b7bfe32330df83f7b8 (diff) | |
Merge branch 'linus' into smp/hotplug
Apply upstream changes to avoid conflicts with pending patches.
Diffstat (limited to 'drivers/hwmon/it87.c')
| -rw-r--r-- | drivers/hwmon/it87.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c index 730d84028260..d0203a115eff 100644 --- a/drivers/hwmon/it87.c +++ b/drivers/hwmon/it87.c | |||
| @@ -491,7 +491,7 @@ struct it87_sio_data { | |||
| 491 | struct it87_data { | 491 | struct it87_data { |
| 492 | const struct attribute_group *groups[7]; | 492 | const struct attribute_group *groups[7]; |
| 493 | enum chips type; | 493 | enum chips type; |
| 494 | u16 features; | 494 | u32 features; |
| 495 | u8 peci_mask; | 495 | u8 peci_mask; |
| 496 | u8 old_peci_mask; | 496 | u8 old_peci_mask; |
| 497 | 497 | ||