diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-07 10:54:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-07 10:54:19 -0700 |
| commit | 7b4022fa17991801e29f09c6794bbf4d1a0d6b6d (patch) | |
| tree | 39e1597430fb99407b491c888d6ac6d9fe7fa81c | |
| parent | 27c7651a6a5f143eccd66db38c7a3035e1f8bcfb (diff) | |
| parent | 94e44413cdda7b1b838a4c508a4eca0cdd5e7a18 (diff) | |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
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
| -rw-r--r-- | Documentation/hwmon/w83791d | 2 | ||||
| -rw-r--r-- | Documentation/hwmon/w83792d | 3 | ||||
| -rw-r--r-- | drivers/hwmon/emc6w201.c | 2 | ||||
| -rw-r--r-- | drivers/hwmon/w83792d.c | 4 |
4 files changed, 5 insertions, 6 deletions
diff --git a/Documentation/hwmon/w83791d b/Documentation/hwmon/w83791d index 90387c3540f7..f4021a285460 100644 --- a/Documentation/hwmon/w83791d +++ b/Documentation/hwmon/w83791d @@ -17,7 +17,7 @@ Credits: Philip Edelbrock <phil@netroedge.com>, and Mark Studebaker <mdsxyz123@yahoo.com> w83792d.c: - Chunhao Huang <DZShen@Winbond.com.tw>, + Shane Huang (Winbond), Rudolf Marek <r.marek@assembler.cz> Additional contributors: diff --git a/Documentation/hwmon/w83792d b/Documentation/hwmon/w83792d index 8a023ce0b72e..53f7b6866fec 100644 --- a/Documentation/hwmon/w83792d +++ b/Documentation/hwmon/w83792d @@ -7,8 +7,7 @@ Supported chips: Addresses scanned: I2C 0x2c - 0x2f Datasheet: http://www.winbond.com.tw -Author: Chunhao Huang -Contact: DZShen <DZShen@Winbond.com.tw> +Author: Shane Huang (Winbond) Module Parameters diff --git a/drivers/hwmon/emc6w201.c b/drivers/hwmon/emc6w201.c index 936898f82f94..82e661e8241b 100644 --- a/drivers/hwmon/emc6w201.c +++ b/drivers/hwmon/emc6w201.c @@ -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_FAN_MIN(nr) (0x62 + (nr) * 2) -enum { input, min, max } subfeature; +enum subfeature { input, min, max }; /* * Per-device data diff --git a/drivers/hwmon/w83792d.c b/drivers/hwmon/w83792d.c index 0b804895be43..5febb43cb4c1 100644 --- a/drivers/hwmon/w83792d.c +++ b/drivers/hwmon/w83792d.c @@ -2,7 +2,7 @@ * w83792d.c - Part of lm_sensors, Linux kernel modules for hardware * monitoring * Copyright (C) 2004, 2005 Winbond Electronics Corp. - * Chunhao Huang <DZShen@Winbond.com.tw>, + * Shane Huang, * Rudolf Marek <r.marek@assembler.cz> * * 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_AUTHOR("Chunhao Huang @ Winbond <DZShen@Winbond.com.tw>"); +MODULE_AUTHOR("Shane Huang (Winbond)"); MODULE_DESCRIPTION("W83792AD/D driver for linux-2.6"); MODULE_LICENSE("GPL"); |