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
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[safe/jmp/linux-2.6]
/
drivers
/
power
/
power_supply_leds.c
diff --git
a/drivers/power/power_supply_leds.c
b/drivers/power/power_supply_leds.c
index
2dece40
..
031a554
100644
(file)
--- a/
drivers/power/power_supply_leds.c
+++ b/
drivers/power/power_supply_leds.c
@@
-12,6
+12,7
@@
#include <linux/kernel.h>
#include <linux/power_supply.h>
+#include <linux/slab.h>
#include "power_supply.h"