git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ppp_generic: fix multilink fragment sizes
[safe/jmp/linux-2.6]
/
drivers
/
hwmon
/
adt7462.c
diff --git
a/drivers/hwmon/adt7462.c
b/drivers/hwmon/adt7462.c
index
a1a7ef1
..
2af0c7b
100644
(file)
--- a/
drivers/hwmon/adt7462.c
+++ b/
drivers/hwmon/adt7462.c
@@
-28,6
+28,7
@@
#include <linux/mutex.h>
#include <linux/delay.h>
#include <linux/log2.h>
#include <linux/mutex.h>
#include <linux/delay.h>
#include <linux/log2.h>
+#include <linux/slab.h>
/* Addresses to scan */
static const unsigned short normal_i2c[] = { 0x58, 0x5C, I2C_CLIENT_END };
/* Addresses to scan */
static const unsigned short normal_i2c[] = { 0x58, 0x5C, I2C_CLIENT_END };
@@
-94,7
+95,7
@@
static const unsigned short normal_i2c[] = { 0x58, 0x5C, I2C_CLIENT_END };
#define ADT7462_PIN24_SHIFT 6
#define ADT7462_PIN26_VOLT_INPUT 0x08
#define ADT7462_PIN25_VOLT_INPUT 0x20
#define ADT7462_PIN24_SHIFT 6
#define ADT7462_PIN26_VOLT_INPUT 0x08
#define ADT7462_PIN25_VOLT_INPUT 0x20
-#define ADT7462_PIN28_SHIFT
6
/* cfg3 */
+#define ADT7462_PIN28_SHIFT
4
/* cfg3 */
#define ADT7462_PIN28_VOLT 0x5
#define ADT7462_REG_ALARM1 0xB8
#define ADT7462_PIN28_VOLT 0x5
#define ADT7462_REG_ALARM1 0xB8
@@
-179,7
+180,7
@@
static const unsigned short normal_i2c[] = { 0x58, 0x5C, I2C_CLIENT_END };
*
* Some, but not all, of these voltages have low/high limits.
*/
*
* Some, but not all, of these voltages have low/high limits.
*/
-#define ADT7462_VOLT_COUNT 1
2
+#define ADT7462_VOLT_COUNT 1
3
#define ADT7462_VENDOR 0x41
#define ADT7462_DEVICE 0x62
#define ADT7462_VENDOR 0x41
#define ADT7462_DEVICE 0x62