From c8480522dfdef8b1fdbce67fb729641e9f89e75d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Fran=C3=A7ois=20Tigeot?= <ftigeot@wolfpond.org>
Date: Tue, 12 Apr 2016 10:00:42 +0200
Subject: [PATCH] drm/linux: Move M_DRM declaration to linux/slab.h

---
 sys/dev/drm/include/drm/drmP.h   | 2 --
 sys/dev/drm/include/linux/slab.h | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/dev/drm/include/drm/drmP.h b/sys/dev/drm/include/drm/drmP.h
index 3b3e6ff9bd..6aa7cd3bc0 100644
--- a/sys/dev/drm/include/drm/drmP.h
+++ b/sys/dev/drm/include/drm/drmP.h
@@ -83,8 +83,6 @@
 #include <sys/agpio.h>
 #include <sys/mutex.h>
 
-MALLOC_DECLARE(M_DRM);
-
 #include <uapi_drm/drm.h>
 #include <uapi_drm/drm_sarea.h>
 
diff --git a/sys/dev/drm/include/linux/slab.h b/sys/dev/drm/include/linux/slab.h
index 35fed8534e..adcbd7d8ed 100644
--- a/sys/dev/drm/include/linux/slab.h
+++ b/sys/dev/drm/include/linux/slab.h
@@ -30,6 +30,8 @@
 #include <linux/gfp.h>
 #include <linux/types.h>
 
+MALLOC_DECLARE(M_DRM);
+
 #define kzalloc(size, flags)	kmalloc(size, M_DRM, flags | M_ZERO)
 
 #define kfree(ptr)	do {		\
-- 
2.11.4.GIT