summaryrefslogtreecommitdiffstats
path: root/drivers/leds/leds-adp5520.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-04-13 09:28:45 +0200
committerDavid S. Miller <davem@davemloft.net>2010-04-13 09:28:45 +0200
commit9343af084c7e8911897b0883042ee690cee3aaef (patch)
tree6211a4bdc84690bec6530d27a3abb19f5e8bb8f3 /drivers/leds/leds-adp5520.c
parentsparc64: Fix memory leak in pci_register_iommu_region(). (diff)
parentLinux 2.6.34-rc4 (diff)
downloadlinux-9343af084c7e8911897b0883042ee690cee3aaef.tar.xz
linux-9343af084c7e8911897b0883042ee690cee3aaef.zip
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts: lib/Kconfig.debug
Diffstat (limited to 'drivers/leds/leds-adp5520.c')
-rw-r--r--drivers/leds/leds-adp5520.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/leds/leds-adp5520.c b/drivers/leds/leds-adp5520.c
index a8f315902131..7ba4c7b5b97e 100644
--- a/drivers/leds/leds-adp5520.c
+++ b/drivers/leds/leds-adp5520.c
@@ -20,6 +20,7 @@
#include <linux/leds.h>
#include <linux/workqueue.h>
#include <linux/mfd/adp5520.h>
+#include <linux/slab.h>
struct adp5520_led {
struct led_classdev cdev;