Merge branch 'devel-stable' into devel

[deliverable/linux.git] / arch / arm / mach-u300 / mmc.c

diff --git a/arch/arm/mach-u300/mmc.c b/arch/arm/mach-u300/mmc.c
index 783f1236fe1bb227137831ef0be21b3e930ea636..88506d030596162df589f1d7163bd90356f8e6f2 100644 (file)
--- a/arch/arm/mach-u300/mmc.c
+++ b/arch/arm/mach-u300/mmc.c
@@ -20,6 +20,7 @@
 #include <linux/regulator/machine.h>
 #include <linux/gpio.h>
 #include <linux/amba/mmci.h>
+#include <linux/slab.h>
 
 #include "mmc.h"
 #include "padmux.h"