With drm_memory.h gone, there is no header left that uses __OS_HAS_AGP. Move it into drm_agpsupport.h (which is itself included from drmP.h) to hide it harder from public eyes.
Signed-off-by: David Herrmann dh.herrmann@gmail.com --- include/drm/drmP.h | 2 -- include/drm/drm_agpsupport.h | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 294f7da..c6f337c 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -67,8 +67,6 @@
#include <linux/idr.h>
-#define __OS_HAS_AGP (defined(CONFIG_AGP) || (defined(CONFIG_AGP_MODULE) && defined(MODULE))) - struct module;
struct drm_file; diff --git a/include/drm/drm_agpsupport.h b/include/drm/drm_agpsupport.h index 3bebeb4..4f1724c 100644 --- a/include/drm/drm_agpsupport.h +++ b/include/drm/drm_agpsupport.h @@ -8,6 +8,9 @@ #include <linux/agp_backend.h> #include <drm/drmP.h>
+#define __OS_HAS_AGP (defined(CONFIG_AGP) || (defined(CONFIG_AGP_MODULE) && \ + defined(MODULE))) + struct drm_agp_head { struct agp_kern_info agp_info; struct list_head memory;