diff options
| author |   David Herrmann <dh.herrmann@gmail.com> | 2014-08-29 12:12:36 +0200 |
|---|---|---|
| committer |   Dave Airlie <airlied@redhat.com> | 2014-09-10 17:41:03 +1000 |
| commit | 71930d74e4ad5b2cddc03e0a47ad0cc7ba51845c (patch) | |
| tree | ea32f94956002e381ce3e17d97f659e09470ebb6 /include/drm | |
| parent | drm: merge drm_memory.h into drm_memory.c (diff) | |
| download | linux-dev-71930d74e4ad5b2cddc03e0a47ad0cc7ba51845c.tar.xz linux-dev-71930d74e4ad5b2cddc03e0a47ad0cc7ba51845c.zip | |
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>
Diffstat (limited to 'include/drm')
| -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 @@ #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 3bebeb4af864..4f1724c7ba8c 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; |