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/lm78.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/lm78.c')
| -rw-r--r-- | drivers/hwmon/lm78.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c index 9fb572f03ba..565c4e679b8 100644 --- a/drivers/hwmon/lm78.c +++ b/drivers/hwmon/lm78.c @@ -864,7 +864,7 @@ static int __init lm78_isa_found(unsigned short address) /* Determine the chip type */ outb_p(LM78_REG_CHIPID, address + LM78_ADDR_REG_OFFSET); val = inb_p(address + LM78_DATA_REG_OFFSET); - if (val == 0x00 /* LM78 */ + if (val == 0x00 || val == 0x20 /* LM78 */ || val == 0x40 /* LM78-J */ || (val & 0xfe) == 0xc0) /* LM79 */ found = 1; |