Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: hwmon: (asc7621) Add X58 entry in Kconfig hwmon: (w83793) Saving negative errors in unsigned hwmon: (coretemp) Add missing newline to dev_warn() message hwmon: (coretemp) Fix cpu model output
This commit is contained in:
commit
9d54e2c0b0
|
@ -217,8 +217,8 @@ config SENSORS_ASC7621
|
||||||
depends on HWMON && I2C
|
depends on HWMON && I2C
|
||||||
help
|
help
|
||||||
If you say yes here you get support for the aSC7621
|
If you say yes here you get support for the aSC7621
|
||||||
family of SMBus sensors chip found on most Intel X48, X38, 975,
|
family of SMBus sensors chip found on most Intel X38, X48, X58,
|
||||||
965 and 945 desktop boards. Currently supported chips:
|
945, 965 and 975 desktop boards. Currently supported chips:
|
||||||
aSC7621
|
aSC7621
|
||||||
aSC7621a
|
aSC7621a
|
||||||
|
|
||||||
|
|
|
@ -228,7 +228,7 @@ static int __devinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *
|
||||||
if (err) {
|
if (err) {
|
||||||
dev_warn(dev,
|
dev_warn(dev,
|
||||||
"Unable to access MSR 0xEE, for Tjmax, left"
|
"Unable to access MSR 0xEE, for Tjmax, left"
|
||||||
" at default");
|
" at default\n");
|
||||||
} else if (eax & 0x40000000) {
|
} else if (eax & 0x40000000) {
|
||||||
tjmax = tjmax_ee;
|
tjmax = tjmax_ee;
|
||||||
}
|
}
|
||||||
|
@ -466,7 +466,7 @@ static int __init coretemp_init(void)
|
||||||
family 6 CPU */
|
family 6 CPU */
|
||||||
if ((c->x86 == 0x6) && (c->x86_model > 0xf))
|
if ((c->x86 == 0x6) && (c->x86_model > 0xf))
|
||||||
printk(KERN_WARNING DRVNAME ": Unknown CPU "
|
printk(KERN_WARNING DRVNAME ": Unknown CPU "
|
||||||
"model %x\n", c->x86_model);
|
"model 0x%x\n", c->x86_model);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1294,7 +1294,7 @@ static int watchdog_close(struct inode *inode, struct file *filp)
|
||||||
static ssize_t watchdog_write(struct file *filp, const char __user *buf,
|
static ssize_t watchdog_write(struct file *filp, const char __user *buf,
|
||||||
size_t count, loff_t *offset)
|
size_t count, loff_t *offset)
|
||||||
{
|
{
|
||||||
size_t ret;
|
ssize_t ret;
|
||||||
struct w83793_data *data = filp->private_data;
|
struct w83793_data *data = filp->private_data;
|
||||||
|
|
||||||
if (count) {
|
if (count) {
|
||||||
|
|
Reference in New Issue