korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 12:28:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging

Browse Source 
Pull hwmon fixes from Jean Delvare.

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  hwmon: (emc6w201) Do not declare enum variable
  hwmon: (w83792d) Update module author
This commit is contained in:
Linus Torvalds 2013-09-07 10:54:19 -07:00
commit 7b4022fa17
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/hwmon/w83791d
View File

@ -17,7 +17,7 @@ Credits:
Philip Edelbrock <phil@netroedge.com>, Philip Edelbrock <phil@netroedge.com>,
and Mark Studebaker <mdsxyz123@yahoo.com> and Mark Studebaker <mdsxyz123@yahoo.com>
w83792d.c: w83792d.c:
Chunhao Huang <DZShen@Winbond.com.tw>, Shane Huang (Winbond),
Rudolf Marek <r.marek@assembler.cz> Rudolf Marek <r.marek@assembler.cz>
Additional contributors: Additional contributors:

3
Documentation/hwmon/w83792d
View File

@ -7,8 +7,7 @@ Supported chips:
Addresses scanned: I2C 0x2c - 0x2f Addresses scanned: I2C 0x2c - 0x2f
Datasheet: http://www.winbond.com.tw Datasheet: http://www.winbond.com.tw
Author: Chunhao Huang Author: Shane Huang (Winbond)
Contact: DZShen <DZShen@Winbond.com.tw>
Module Parameters Module Parameters

2
drivers/hwmon/emc6w201.c
View File

@ -49,7 +49,7 @@ static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
#define EMC6W201_REG_TEMP_HIGH(nr) (0x57 + (nr) * 2) #define EMC6W201_REG_TEMP_HIGH(nr) (0x57 + (nr) * 2)
#define EMC6W201_REG_FAN_MIN(nr) (0x62 + (nr) * 2) #define EMC6W201_REG_FAN_MIN(nr) (0x62 + (nr) * 2)
enum { input, min, max } subfeature; enum subfeature { input, min, max };
/* /*
* Per-device data * Per-device data

4
drivers/hwmon/w83792d.c
View File

@ -2,7 +2,7 @@
* w83792d.c - Part of lm_sensors, Linux kernel modules for hardware * w83792d.c - Part of lm_sensors, Linux kernel modules for hardware
* monitoring * monitoring
* Copyright (C) 2004, 2005 Winbond Electronics Corp. * Copyright (C) 2004, 2005 Winbond Electronics Corp.
* Chunhao Huang <DZShen@Winbond.com.tw>, * Shane Huang,
* Rudolf Marek <r.marek@assembler.cz> * Rudolf Marek <r.marek@assembler.cz>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -1665,6 +1665,6 @@ static void w83792d_print_debug(struct w83792d_data *data, struct device *dev)
module_i2c_driver(w83792d_driver); module_i2c_driver(w83792d_driver);
MODULE_AUTHOR("Chunhao Huang @ Winbond <DZShen@Winbond.com.tw>"); MODULE_AUTHOR("Shane Huang (Winbond)");
MODULE_DESCRIPTION("W83792AD/D driver for linux-2.6"); MODULE_DESCRIPTION("W83792AD/D driver for linux-2.6");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");