diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-31 23:40:50 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-31 23:40:50 -0400 |
| commit | dd9cd6d4351076c78bb8c0f9146d1904b481fdbb (patch) | |
| tree | d633c460e2232def1a59b0e6f6c00711d835d911 /drivers/hwmon/it87.c | |
| parent | 128a2bcf9dddeb8e79a4ba55bf191533f70f39ce (diff) | |
| parent | 5cccf4a1a258ea5bff20e8440deb3dfcf032b04a (diff) | |
Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6
* 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6:
hwmon: fscher read control bugfix
hwmon: (adm1031) Fix broken links in documentation
hwmon: make abituguru3_read_increment_offset() static
hwmon: Fix regression caused by typo in lm90.c
hwmon: (applesmc) add temperature sensors set for Macbook
hwmon: fscher control update bugfix
hwmon: fix dme1737 temp fault attribute
hwmon: Add missing __devexit tags in various drivers
hwmon: clean up duplicate includes
hwmon: fix lm78 detection regression
hwmon: fix array overruns in lm93.c
hwmon: add support for THMC50 and ADM1022
Diffstat (limited to 'drivers/hwmon/it87.c')
| -rw-r--r-- | drivers/hwmon/it87.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c index eff6036e15c0..d75dba9b810b 100644 --- a/drivers/hwmon/it87.c +++ b/drivers/hwmon/it87.c | |||
| @@ -252,7 +252,7 @@ struct it87_data { | |||
| 252 | 252 | ||
| 253 | 253 | ||
| 254 | static int it87_probe(struct platform_device *pdev); | 254 | static int it87_probe(struct platform_device *pdev); |
| 255 | static int it87_remove(struct platform_device *pdev); | 255 | static int __devexit it87_remove(struct platform_device *pdev); |
| 256 | 256 | ||
| 257 | static int it87_read_value(struct it87_data *data, u8 reg); | 257 | static int it87_read_value(struct it87_data *data, u8 reg); |
| 258 | static void it87_write_value(struct it87_data *data, u8 reg, u8 value); | 258 | static void it87_write_value(struct it87_data *data, u8 reg, u8 value); |