diff options
author | Anton Vorontsov <cbouatmailru@gmail.com> | 2010-04-26 13:56:19 -0400 |
---|---|---|
committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2010-04-26 13:56:19 -0400 |
commit | 8ef1bb539203629f77a61976e4f25415e1083bff (patch) | |
tree | 4fee25aca0928f112716fb02d27b1b355d0843b4 /drivers/power | |
parent | a3bcbbee83f55cbaec9b2ad748e7300c7feb2192 (diff) | |
parent | b91ce4d14a21fc04d165be30319541e0f9204f15 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/power')
-rw-r--r-- | drivers/power/bq27x00_battery.c | 1 | ||||
-rw-r--r-- | drivers/power/da9030_battery.c | 1 | ||||
-rw-r--r-- | drivers/power/ds2760_battery.c | 1 | ||||
-rw-r--r-- | drivers/power/ds2782_battery.c | 1 | ||||
-rw-r--r-- | drivers/power/max17040_battery.c | 1 | ||||
-rw-r--r-- | drivers/power/max8925_power.c | 1 | ||||
-rw-r--r-- | drivers/power/pcf50633-charger.c | 1 | ||||
-rw-r--r-- | drivers/power/pmu_battery.c | 1 | ||||
-rw-r--r-- | drivers/power/power_supply_leds.c | 1 | ||||
-rw-r--r-- | drivers/power/power_supply_sysfs.c | 1 | ||||
-rw-r--r-- | drivers/power/wm831x_backup.c | 1 | ||||
-rw-r--r-- | drivers/power/wm831x_power.c | 1 | ||||
-rw-r--r-- | drivers/power/wm97xx_battery.c | 1 |
13 files changed, 13 insertions, 0 deletions
diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c index bece33ed873..3ec9c6a8896 100644 --- a/drivers/power/bq27x00_battery.c +++ b/drivers/power/bq27x00_battery.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <linux/power_supply.h> | 24 | #include <linux/power_supply.h> |
25 | #include <linux/idr.h> | 25 | #include <linux/idr.h> |
26 | #include <linux/i2c.h> | 26 | #include <linux/i2c.h> |
27 | #include <linux/slab.h> | ||
27 | #include <asm/unaligned.h> | 28 | #include <asm/unaligned.h> |
28 | 29 | ||
29 | #define DRIVER_VERSION "1.1.0" | 30 | #define DRIVER_VERSION "1.1.0" |
diff --git a/drivers/power/da9030_battery.c b/drivers/power/da9030_battery.c index a2e71f7b27f..d2c793cf676 100644 --- a/drivers/power/da9030_battery.c +++ b/drivers/power/da9030_battery.c | |||
@@ -10,6 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
13 | #include <linux/slab.h> | ||
13 | #include <linux/init.h> | 14 | #include <linux/init.h> |
14 | #include <linux/types.h> | 15 | #include <linux/types.h> |
15 | #include <linux/device.h> | 16 | #include <linux/device.h> |
diff --git a/drivers/power/ds2760_battery.c b/drivers/power/ds2760_battery.c index 6f1dba5a519..3bf8d1f622e 100644 --- a/drivers/power/ds2760_battery.c +++ b/drivers/power/ds2760_battery.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <linux/jiffies.h> | 24 | #include <linux/jiffies.h> |
25 | #include <linux/workqueue.h> | 25 | #include <linux/workqueue.h> |
26 | #include <linux/pm.h> | 26 | #include <linux/pm.h> |
27 | #include <linux/slab.h> | ||
27 | #include <linux/platform_device.h> | 28 | #include <linux/platform_device.h> |
28 | #include <linux/power_supply.h> | 29 | #include <linux/power_supply.h> |
29 | 30 | ||
diff --git a/drivers/power/ds2782_battery.c b/drivers/power/ds2782_battery.c index 305d463a880..ba1bd1a545b 100644 --- a/drivers/power/ds2782_battery.c +++ b/drivers/power/ds2782_battery.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <linux/i2c.h> | 19 | #include <linux/i2c.h> |
20 | #include <linux/idr.h> | 20 | #include <linux/idr.h> |
21 | #include <linux/power_supply.h> | 21 | #include <linux/power_supply.h> |
22 | #include <linux/slab.h> | ||
22 | 23 | ||
23 | #define DS2782_REG_RARC 0x06 /* Remaining active relative capacity */ | 24 | #define DS2782_REG_RARC 0x06 /* Remaining active relative capacity */ |
24 | 25 | ||
diff --git a/drivers/power/max17040_battery.c b/drivers/power/max17040_battery.c index 87b98bf27ae..f3e22c9fe20 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 |
diff --git a/drivers/power/max8925_power.c b/drivers/power/max8925_power.c index a1b4410544d..8e5aec26086 100644 --- a/drivers/power/max8925_power.c +++ b/drivers/power/max8925_power.c | |||
@@ -11,6 +11,7 @@ | |||
11 | 11 | ||
12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
13 | #include <linux/err.h> | 13 | #include <linux/err.h> |
14 | #include <linux/slab.h> | ||
14 | #include <linux/i2c.h> | 15 | #include <linux/i2c.h> |
15 | #include <linux/interrupt.h> | 16 | #include <linux/interrupt.h> |
16 | #include <linux/platform_device.h> | 17 | #include <linux/platform_device.h> |
diff --git a/drivers/power/pcf50633-charger.c b/drivers/power/pcf50633-charger.c index ea3fdfaca90..066f994e6fe 100644 --- a/drivers/power/pcf50633-charger.c +++ b/drivers/power/pcf50633-charger.c | |||
@@ -16,6 +16,7 @@ | |||
16 | 16 | ||
17 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
19 | #include <linux/slab.h> | ||
19 | #include <linux/init.h> | 20 | #include <linux/init.h> |
20 | #include <linux/types.h> | 21 | #include <linux/types.h> |
21 | #include <linux/device.h> | 22 | #include <linux/device.h> |
diff --git a/drivers/power/pmu_battery.c b/drivers/power/pmu_battery.c index 9c87ad56480..023d24993b8 100644 --- a/drivers/power/pmu_battery.c +++ b/drivers/power/pmu_battery.c | |||
@@ -14,6 +14,7 @@ | |||
14 | #include <linux/power_supply.h> | 14 | #include <linux/power_supply.h> |
15 | #include <linux/adb.h> | 15 | #include <linux/adb.h> |
16 | #include <linux/pmu.h> | 16 | #include <linux/pmu.h> |
17 | #include <linux/slab.h> | ||
17 | 18 | ||
18 | static struct pmu_battery_dev { | 19 | static struct pmu_battery_dev { |
19 | struct power_supply bat; | 20 | struct power_supply bat; |
diff --git a/drivers/power/power_supply_leds.c b/drivers/power/power_supply_leds.c index 2dece40c544..031a554837f 100644 --- a/drivers/power/power_supply_leds.c +++ b/drivers/power/power_supply_leds.c | |||
@@ -12,6 +12,7 @@ | |||
12 | 12 | ||
13 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
14 | #include <linux/power_supply.h> | 14 | #include <linux/power_supply.h> |
15 | #include <linux/slab.h> | ||
15 | 16 | ||
16 | #include "power_supply.h" | 17 | #include "power_supply.h" |
17 | 18 | ||
diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c index ff05e618976..5b6e352ac7c 100644 --- a/drivers/power/power_supply_sysfs.c +++ b/drivers/power/power_supply_sysfs.c | |||
@@ -13,6 +13,7 @@ | |||
13 | 13 | ||
14 | #include <linux/ctype.h> | 14 | #include <linux/ctype.h> |
15 | #include <linux/power_supply.h> | 15 | #include <linux/power_supply.h> |
16 | #include <linux/slab.h> | ||
16 | 17 | ||
17 | #include "power_supply.h" | 18 | #include "power_supply.h" |
18 | 19 | ||
diff --git a/drivers/power/wm831x_backup.c b/drivers/power/wm831x_backup.c index bf4f387a800..0fd130d80f5 100644 --- a/drivers/power/wm831x_backup.c +++ b/drivers/power/wm831x_backup.c | |||
@@ -12,6 +12,7 @@ | |||
12 | #include <linux/err.h> | 12 | #include <linux/err.h> |
13 | #include <linux/platform_device.h> | 13 | #include <linux/platform_device.h> |
14 | #include <linux/power_supply.h> | 14 | #include <linux/power_supply.h> |
15 | #include <linux/slab.h> | ||
15 | 16 | ||
16 | #include <linux/mfd/wm831x/core.h> | 17 | #include <linux/mfd/wm831x/core.h> |
17 | #include <linux/mfd/wm831x/auxadc.h> | 18 | #include <linux/mfd/wm831x/auxadc.h> |
diff --git a/drivers/power/wm831x_power.c b/drivers/power/wm831x_power.c index bf2ff413247..fbcc36dae47 100644 --- a/drivers/power/wm831x_power.c +++ b/drivers/power/wm831x_power.c | |||
@@ -12,6 +12,7 @@ | |||
12 | #include <linux/err.h> | 12 | #include <linux/err.h> |
13 | #include <linux/platform_device.h> | 13 | #include <linux/platform_device.h> |
14 | #include <linux/power_supply.h> | 14 | #include <linux/power_supply.h> |
15 | #include <linux/slab.h> | ||
15 | 16 | ||
16 | #include <linux/mfd/wm831x/core.h> | 17 | #include <linux/mfd/wm831x/core.h> |
17 | #include <linux/mfd/wm831x/auxadc.h> | 18 | #include <linux/mfd/wm831x/auxadc.h> |
diff --git a/drivers/power/wm97xx_battery.c b/drivers/power/wm97xx_battery.c index 23eed356a85..94c70650aaf 100644 --- a/drivers/power/wm97xx_battery.c +++ b/drivers/power/wm97xx_battery.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
24 | #include <linux/gpio.h> | 24 | #include <linux/gpio.h> |
25 | #include <linux/irq.h> | 25 | #include <linux/irq.h> |
26 | #include <linux/slab.h> | ||
26 | 27 | ||
27 | static DEFINE_MUTEX(bat_lock); | 28 | static DEFINE_MUTEX(bat_lock); |
28 | static struct work_struct bat_work; | 29 | static struct work_struct bat_work; |