diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-26 18:23:24 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-26 18:23:24 -0400 |
| commit | 08abe18af1f78ee80c3c3a5ac47c3e0ae0beadf6 (patch) | |
| tree | 2be39bf8942edca1bcec735145e144a682ca9cd3 /Documentation/hwmon/lm90 | |
| parent | f0de70f8bb56952f6e016a65a8a8d006918f5bf6 (diff) | |
| parent | 0384e2959127a56d0640505d004d8dd92f9c29f5 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/net/wimax/i2400m/usb-notif.c
Diffstat (limited to 'Documentation/hwmon/lm90')
| -rw-r--r-- | Documentation/hwmon/lm90 | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/hwmon/lm90 b/Documentation/hwmon/lm90 index 0e8411710238..93d8e3d55150 100644 --- a/Documentation/hwmon/lm90 +++ b/Documentation/hwmon/lm90 | |||
| @@ -42,6 +42,11 @@ Supported chips: | |||
| 42 | Addresses scanned: I2C 0x4e | 42 | Addresses scanned: I2C 0x4e |
| 43 | Datasheet: Publicly available at the Maxim website | 43 | Datasheet: Publicly available at the Maxim website |
| 44 | http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3497 | 44 | http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3497 |
| 45 | * Maxim MAX6648 | ||
| 46 | Prefix: 'max6646' | ||
| 47 | Addresses scanned: I2C 0x4c | ||
| 48 | Datasheet: Publicly available at the Maxim website | ||
| 49 | http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3500 | ||
| 45 | * Maxim MAX6649 | 50 | * Maxim MAX6649 |
| 46 | Prefix: 'max6646' | 51 | Prefix: 'max6646' |
| 47 | Addresses scanned: I2C 0x4c | 52 | Addresses scanned: I2C 0x4c |
| @@ -74,6 +79,11 @@ Supported chips: | |||
| 74 | 0x4c, 0x4d and 0x4e | 79 | 0x4c, 0x4d and 0x4e |
| 75 | Datasheet: Publicly available at the Maxim website | 80 | Datasheet: Publicly available at the Maxim website |
| 76 | http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3370 | 81 | http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3370 |
| 82 | * Maxim MAX6692 | ||
| 83 | Prefix: 'max6646' | ||
| 84 | Addresses scanned: I2C 0x4c | ||
| 85 | Datasheet: Publicly available at the Maxim website | ||
| 86 | http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3500 | ||
| 77 | 87 | ||
| 78 | 88 | ||
| 79 | Author: Jean Delvare <khali@linux-fr.org> | 89 | Author: Jean Delvare <khali@linux-fr.org> |