Merge master.kernel.org:/home/rmk/linux-2.6-arm

[mv-sheeva.git] / drivers / regulator / max8660.c

diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
index 47f90b2fc290208eb302e8b9ef44ed6fe7f53a1d..3790b21879ff2f8d2c5b8000fe216f1f0770a436 100644 (file)
--- a/drivers/regulator/max8660.c
+++ b/drivers/regulator/max8660.c
@@ -42,6 +42,7 @@
 #include <linux/i2c.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/driver.h>
+#include <linux/slab.h>
 #include <linux/regulator/max8660.h>
 
 #define MAX8660_DCDC_MIN_UV     725000