diff options
| author | David Herrmann | 2014-08-29 12:12:35 +0200 |
|---|---|---|
| committer | Dave Airlie | 2014-09-10 09:40:51 +0200 |
| commit | d6db6564457c5ad617c3bcf44bed58a227f4c702 (patch) | |
| tree | 70bd4e5b7d3d1f26949c451576370c4cd6077e3a /include/drm/drmP.h | |
| parent | drm: drop __KERNEL__ protection in drmP.h (diff) | |
| download | kernel-qcow2-linux-d6db6564457c5ad617c3bcf44bed58a227f4c702.tar.gz kernel-qcow2-linux-d6db6564457c5ad617c3bcf44bed58a227f4c702.tar.xz kernel-qcow2-linux-d6db6564457c5ad617c3bcf44bed58a227f4c702.zip | |
drm: merge drm_memory.h into drm_memory.c
The drm_memory.h header is only used to define PAGE_AGP, which is only
used in drm_memory.c. Fold the header into drm_memory.c and drop it.
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/drm/drmP.h')
| -rw-r--r-- | include/drm/drmP.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index d3504c6ff15e..294f7daf543e 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -58,6 +58,8 @@ #include <linux/agp_backend.h> #include <linux/workqueue.h> #include <linux/poll.h> +#include <linux/highmem.h> +#include <linux/vmalloc.h> #include <asm/pgalloc.h> #include <drm/drm.h> #include <drm/drm_sarea.h> @@ -1127,10 +1129,6 @@ extern void drm_vm_open_locked(struct drm_device *dev, struct vm_area_struct *vm extern void drm_vm_close_locked(struct drm_device *dev, struct vm_area_struct *vma); extern unsigned int drm_poll(struct file *filp, struct poll_table_struct *wait); - /* Memory management support (drm_memory.h) */ -#include <drm/drm_memory.h> - - /* Misc. IOCTL support (drm_ioctl.h) */ extern int drm_irq_by_busid(struct drm_device *dev, void *data, struct drm_file *file_priv); |