diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/hwmon/adm1025.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/hwmon/adm1025.c')
| -rw-r--r-- | drivers/hwmon/adm1025.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/adm1025.c b/drivers/hwmon/adm1025.c index 251b63165e2a..60befc0ee65f 100644 --- a/drivers/hwmon/adm1025.c +++ b/drivers/hwmon/adm1025.c | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | * resolution of about 0.5% of the nominal value). Temperature values are | 12 | * resolution of about 0.5% of the nominal value). Temperature values are |
| 13 | * reported with a 1 deg resolution and a 3 deg accuracy. Complete | 13 | * reported with a 1 deg resolution and a 3 deg accuracy. Complete |
| 14 | * datasheet can be obtained from Analog's website at: | 14 | * datasheet can be obtained from Analog's website at: |
| 15 | * http://www.analog.com/Analog_Root/productPage/productHome/0,2121,ADM1025,00.html | 15 | * http://www.onsemi.com/PowerSolutions/product.do?id=ADM1025 |
| 16 | * | 16 | * |
| 17 | * This driver also supports the ADM1025A, which differs from the ADM1025 | 17 | * This driver also supports the ADM1025A, which differs from the ADM1025 |
| 18 | * only in that it has "open-drain VID inputs while the ADM1025 has | 18 | * only in that it has "open-drain VID inputs while the ADM1025 has |