diff options
| author | David Howells | 2012-10-02 19:01:03 +0200 |
|---|---|---|
| committer | David Howells | 2012-10-02 19:01:03 +0200 |
| commit | 19218e482d3f023166b26143c1a1c6d166a30415 (patch) | |
| tree | e67dac7d591077432fd8838d1e5d8fe91456c227 /include/drm | |
| parent | drivers: bus: omap_l3: fixup merge conflict resolution (diff) | |
| download | kernel-qcow2-linux-19218e482d3f023166b26143c1a1c6d166a30415.tar.gz kernel-qcow2-linux-19218e482d3f023166b26143c1a1c6d166a30415.tar.xz kernel-qcow2-linux-19218e482d3f023166b26143c1a1c6d166a30415.zip | |
UAPI: Refer to the DRM UAPI headers with <...> and from certain headers only
Only refer to the DRM UAPI headers (drm.h, drm_mode.h and drm_sarea.h) from
within drmP.h and drm_crtc.h, and use #include <...> to refer to them so that
when the UAPI split happens they can still be accessed.
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Dave Airlie <airlied@redhat.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: Dave Jones <davej@redhat.com>
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/drmP.h | 3 | ||||
| -rw-r--r-- | include/drm/drm_crtc.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index d6b67bb9075f..1b33df4884b5 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -72,7 +72,8 @@ #include <linux/workqueue.h> #include <linux/poll.h> #include <asm/pgalloc.h> -#include "drm.h" +#include <drm/drm.h> +#include <drm/drm_sarea.h> #include <linux/idr.h> diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index bfacf0d5a225..86a0da4635a6 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -30,6 +30,7 @@ #include <linux/types.h> #include <linux/idr.h> #include <linux/fb.h> +#include <drm/drm_mode.h> #include <drm/drm_fourcc.h> |