diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/hwmon/coretemp.c | 7 | ||||
-rw-r--r-- | drivers/hwmon/pmbus/Kconfig | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c index 984a3f13923b..47b8d84b489d 100644 --- a/drivers/hwmon/coretemp.c +++ b/drivers/hwmon/coretemp.c | |||
@@ -205,8 +205,11 @@ static const struct tjmax __cpuinitconst tjmax_table[] = { | |||
205 | { "CPU N455", 100000 }, | 205 | { "CPU N455", 100000 }, |
206 | { "CPU N470", 100000 }, | 206 | { "CPU N470", 100000 }, |
207 | { "CPU N475", 100000 }, | 207 | { "CPU N475", 100000 }, |
208 | { "CPU 230", 100000 }, | 208 | { "CPU 230", 100000 }, /* Model 0x1c, stepping 2 */ |
209 | { "CPU 330", 125000 }, | 209 | { "CPU 330", 125000 }, /* Model 0x1c, stepping 2 */ |
210 | { "CPU CE4110", 110000 }, /* Model 0x1c, stepping 10 */ | ||
211 | { "CPU CE4150", 110000 }, /* Model 0x1c, stepping 10 */ | ||
212 | { "CPU CE4170", 110000 }, /* Model 0x1c, stepping 10 */ | ||
210 | }; | 213 | }; |
211 | 214 | ||
212 | static int __cpuinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id, | 215 | static int __cpuinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id, |
diff --git a/drivers/hwmon/pmbus/Kconfig b/drivers/hwmon/pmbus/Kconfig index 2ca6a5a4f5a7..60745a535821 100644 --- a/drivers/hwmon/pmbus/Kconfig +++ b/drivers/hwmon/pmbus/Kconfig | |||
@@ -4,7 +4,7 @@ | |||
4 | 4 | ||
5 | menuconfig PMBUS | 5 | menuconfig PMBUS |
6 | tristate "PMBus support" | 6 | tristate "PMBus support" |
7 | depends on I2C && EXPERIMENTAL | 7 | depends on I2C |
8 | default n | 8 | default n |
9 | help | 9 | help |
10 | Say yes here if you want to enable PMBus support. | 10 | Say yes here if you want to enable PMBus support. |