diff options
author | David Herrmann <dh.herrmann@gmail.com> | 2014-08-29 06:12:36 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2014-09-10 03:41:03 -0400 |
commit | 71930d74e4ad5b2cddc03e0a47ad0cc7ba51845c (patch) | |
tree | ea32f94956002e381ce3e17d97f659e09470ebb6 | |
parent | d6db6564457c5ad617c3bcf44bed58a227f4c702 (diff) |
drm: move __OS_HAS_AGP into drm_agpsupport.h
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>
Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r-- | include/drm/drmP.h | 2 | ||||
-rw-r--r-- | 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 294f7daf543e..c6f337c54d9f 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h | |||
@@ -67,8 +67,6 @@ | |||
67 | 67 | ||
68 | #include <linux/idr.h> | 68 | #include <linux/idr.h> |
69 | 69 | ||
70 | #define __OS_HAS_AGP (defined(CONFIG_AGP) || (defined(CONFIG_AGP_MODULE) && defined(MODULE))) | ||
71 | |||
72 | struct module; | 70 | struct module; |
73 | 71 | ||
74 | struct drm_file; | 72 | struct drm_file; |
diff --git a/include/drm/drm_agpsupport.h b/include/drm/drm_agpsupport.h index 3bebeb4af864..4f1724c7ba8c 100644 --- a/include/drm/drm_agpsupport.h +++ b/include/drm/drm_agpsupport.h | |||
@@ -8,6 +8,9 @@ | |||
8 | #include <linux/agp_backend.h> | 8 | #include <linux/agp_backend.h> |
9 | #include <drm/drmP.h> | 9 | #include <drm/drmP.h> |
10 | 10 | ||
11 | #define __OS_HAS_AGP (defined(CONFIG_AGP) || (defined(CONFIG_AGP_MODULE) && \ | ||
12 | defined(MODULE))) | ||
13 | |||
11 | struct drm_agp_head { | 14 | struct drm_agp_head { |
12 | struct agp_kern_info agp_info; | 15 | struct agp_kern_info agp_info; |
13 | struct list_head memory; | 16 | struct list_head memory; |