diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-04-22 20:08:44 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-04-22 20:08:44 -0400 |
| commit | 6c9468e9eb1252eaefd94ce7f06e1be9b0b641b1 (patch) | |
| tree | 797676a336b050bfa1ef879377c07e541b9075d6 /drivers/power/max17040_battery.c | |
| parent | 4cb3ca7cd7e2cae8d1daf5345ec99a1e8502cf3f (diff) | |
| parent | c81eddb0e3728661d1585fbc564449c94165cc36 (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'drivers/power/max17040_battery.c')
| -rw-r--r-- | drivers/power/max17040_battery.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/power/max17040_battery.c b/drivers/power/max17040_battery.c index 87b98bf27ae1..f3e22c9fe20a 100644 --- a/drivers/power/max17040_battery.c +++ b/drivers/power/max17040_battery.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/delay.h> | 19 | #include <linux/delay.h> |
| 20 | #include <linux/power_supply.h> | 20 | #include <linux/power_supply.h> |
| 21 | #include <linux/max17040_battery.h> | 21 | #include <linux/max17040_battery.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | 23 | ||
| 23 | #define MAX17040_VCELL_MSB 0x02 | 24 | #define MAX17040_VCELL_MSB 0x02 |
| 24 | #define MAX17040_VCELL_LSB 0x03 | 25 | #define MAX17040_VCELL_LSB 0x03 |