Merge by hand (conflicts between pending drivers and kfree cleanups)

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / raid_class.c

diff --git a/drivers/scsi/raid_class.c b/drivers/scsi/raid_class.c
index a9f99c68556f0cdeff85d1d6bab5e0999028591d..5b1c12041a4fd054ffb00bed6bb9eefda1665930 100644 (file)
--- a/drivers/scsi/raid_class.c
+++ b/drivers/scsi/raid_class.c
@@ -12,6 +12,8 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/list.h>
+#include <linux/slab.h>
+#include <linux/string.h>
 #include <linux/raid_class.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h>