diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-31 20:40:50 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-31 20:40:50 -0700 |
commit | dd9cd6d4351076c78bb8c0f9146d1904b481fdbb (patch) | |
tree | d633c460e2232def1a59b0e6f6c00711d835d911 /drivers/hwmon/via686a.c | |
parent | 128a2bcf9dddeb8e79a4ba55bf191533f70f39ce (diff) | |
parent | 5cccf4a1a258ea5bff20e8440deb3dfcf032b04a (diff) | |
download | kernel-crypto-dd9cd6d4351076c78bb8c0f9146d1904b481fdbb.tar.gz kernel-crypto-dd9cd6d4351076c78bb8c0f9146d1904b481fdbb.tar.xz kernel-crypto-dd9cd6d4351076c78bb8c0f9146d1904b481fdbb.zip |
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/via686a.c')
-rw-r--r-- | drivers/hwmon/via686a.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/via686a.c b/drivers/hwmon/via686a.c index 24a6851491d..696c8a2e537 100644 --- a/drivers/hwmon/via686a.c +++ b/drivers/hwmon/via686a.c @@ -314,7 +314,7 @@ struct via686a_data { static struct pci_dev *s_bridge; /* pointer to the (only) via686a */ static int via686a_probe(struct platform_device *pdev); -static int via686a_remove(struct platform_device *pdev); +static int __devexit via686a_remove(struct platform_device *pdev); static inline int via686a_read_value(struct via686a_data *data, u8 reg) { |