Merge tag 'v3.5-rc7' into late/soc

[firefly-linux-kernel-4.4.55.git] / drivers / media / video / smiapp / smiapp-core.c

diff --git a/drivers/media/video/smiapp/smiapp-core.c b/drivers/media/video/smiapp/smiapp-core.c
index f518026cb67b6e4099522b75ccdc12eeff5f8f24..9cf5bda35fbe1cfe332e8b18ae3d9218b3e8f54b 100644 (file)
--- a/drivers/media/video/smiapp/smiapp-core.c
+++ b/drivers/media/video/smiapp/smiapp-core.c
@@ -31,7 +31,9 @@
 #include <linux/device.h>
 #include <linux/gpio.h>
 #include <linux/module.h>
+#include <linux/slab.h>
 #include <linux/regulator/consumer.h>
+#include <linux/slab.h>
 #include <linux/v4l2-mediabus.h>
 #include <media/v4l2-device.h>