Commit 7b4022fa authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 27c7651a 94e44413

Documentation/hwmon/w83791d

+1 −1
Original line number Diff line number Diff line
@@ -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:

Documentation/hwmon/w83792d

+1 −2
Original line number Diff line number Diff line
@@ -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

drivers/hwmon/emc6w201.c

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/hwmon/w83792d.c

+2 −2
Original line number Diff line number Diff line
@@ -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");