Merge tag 'v3.17-rc4' into sched/core, to prevent conflicts with upcoming patches...

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / drm_lock.c

diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
index f6452682141b5fd25773153233fb97983dafbc40..e26b59e385ff151116f5af63bf47626c2839f8eb 100644 (file)
--- a/drivers/gpu/drm/drm_lock.c
+++ b/drivers/gpu/drm/drm_lock.c
@@ -35,6 +35,7 @@
 
 #include <linux/export.h>
 #include <drm/drmP.h>
+#include "drm_legacy.h"
 
 static int drm_notifier(void *priv);