dri-devel.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
From: Gabriel Laskar <gabriel@lse.epita.fr>
To: David Airlie <airlied@linux.ie>,
	"open list:DRM DRIVERS" <dri-devel@lists.freedesktop.org>,
	"open list:ABI/API" <linux-api@vger.kernel.org>,
	open list <linux-kernel@vger.kernel.org>
Cc: Mikko Rapeli <mikko.rapeli@iki.fi>,
	Emil Velikov <emil.l.velikov@gmail.com>
Subject: [PATCH 18/20] drm: fix inclusion of drm.h in vmwgfx_drm.h
Date: Mon, 30 Nov 2015 15:10:56 +0100	[thread overview]
Message-ID: <1448892658-14256-19-git-send-email-gabriel@lse.epita.fr> (raw)
In-Reply-To: <1448892658-14256-1-git-send-email-gabriel@lse.epita.fr>

Using `#include "drm.h"` instead of `#include <drm/drm.h>` allow drm
headers to be moved in another directory without changes, like for the
libdrm imports.

Signed-off-by: Gabriel Laskar <gabriel@lse.epita.fr>
CC: Emil Velikov <emil.l.velikov@gmail.com>
CC: Mikko Rapeli <mikko.rapeli@iki.fi>

---
 include/uapi/drm/vmwgfx_drm.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/include/uapi/drm/vmwgfx_drm.h b/include/uapi/drm/vmwgfx_drm.h
index 05b2049..2454543 100644
--- a/include/uapi/drm/vmwgfx_drm.h
+++ b/include/uapi/drm/vmwgfx_drm.h
@@ -28,9 +28,7 @@
 #ifndef __VMWGFX_DRM_H__
 #define __VMWGFX_DRM_H__
 
-#ifndef __KERNEL__
-#include <drm/drm.h>
-#endif
+#include "drm.h"
 
 #define DRM_VMW_MAX_SURFACE_FACES 6
 #define DRM_VMW_MAX_MIP_LEVELS 24
-- 
2.6.2

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

  parent reply	other threads:[~2015-11-30 14:11 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1448892658-14256-1-git-send-email-gabriel@lse.epita.fr>
2015-11-30 14:10 ` [PATCH 01/20] drm: use __u{32, 64} instead of uint{32, 64}_t in virtgpu_drm.h Gabriel Laskar
     [not found]   ` <1448892658-14256-2-git-send-email-gabriel-tU7rkvAWjlwhT4uAktR2oQ@public.gmane.org>
2015-12-04 14:22     ` [PATCH 01/20] drm: use __u{32,64} instead of uint{32,64}_t " Emil Velikov
2015-12-05 21:03       ` [PATCH 01/20] drm: use __u{32, 64} instead of uint{32, 64}_t " Dave Airlie
     [not found]         ` <CAPM=9tw1Un5-fZUzYGzXLhVikEHj9gw1FfBDc=YMD7xeeKxS9Q-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-12-07 13:29           ` [PATCH 01/20] drm: use __u{32,64} instead of uint{32,64}_t " Emil Velikov
2015-12-07 13:45             ` Mikko Rapeli
2015-12-09 13:56             ` Gabriel Laskar
2015-11-30 14:10 ` [PATCH 02/20] drm: Kbuild: add admgpu_drm.h to the installed headers Gabriel Laskar
     [not found]   ` <1448892658-14256-3-git-send-email-gabriel-tU7rkvAWjlwhT4uAktR2oQ@public.gmane.org>
2015-11-30 23:57     ` Alex Deucher
2015-11-30 14:10 ` [PATCH 03/20] drm: include drm.h in armada_drm.h Gabriel Laskar
2015-11-30 14:10 ` [PATCH 04/20] drm: drm_fourcc.h fix includes Gabriel Laskar
2015-11-30 14:10 ` [PATCH 05/20] drm: drm_mode.h " Gabriel Laskar
2015-11-30 14:10 ` [PATCH 06/20] drm: fix inclusion of drm.h in drm_sarea.h Gabriel Laskar
2015-11-30 14:10 ` [PATCH 07/20] drm: fix inclusion of drm.h in exynos_sarea.h Gabriel Laskar
2015-11-30 14:10 ` [PATCH 08/20] drm: fix inclusion of drm.h in i810_drm.h Gabriel Laskar
2015-11-30 14:10 ` [PATCH 09/20] drm: fix inclusion of drm.h in exynos_sarea.h Gabriel Laskar
2015-11-30 14:10 ` [PATCH 10/20] drm: fix inclusion of drm.h in mga_drm.h Gabriel Laskar
2015-11-30 14:10 ` [PATCH 11/20] drm: fix inclusion of drm.h in msm_drm.h Gabriel Laskar
2015-11-30 14:10 ` [PATCH 12/20] drm: fix inclusion of drm.h in omap_drm.h Gabriel Laskar
2015-11-30 14:10 ` [PATCH 13/20] drm: fix inclusion of drm.h in qxl_drm.h Gabriel Laskar
2015-11-30 14:10 ` [PATCH 14/20] drm: fix inclusion of drm.h in r128_drm.h Gabriel Laskar
2015-11-30 14:10 ` [PATCH 15/20] drm: fix inclusion of drm.h in savage_drm.h Gabriel Laskar
2015-11-30 14:10 ` [PATCH 16/20] drm: fix inclusion of drm.h in tegra_drm.h Gabriel Laskar
2015-11-30 14:10 ` [PATCH 17/20] drm: fix inclusion of drm.h in virtgpu_drm.h Gabriel Laskar
2015-11-30 14:10 ` Gabriel Laskar [this message]
2015-11-30 14:10 ` [PATCH 19/20] drm: fix inclusion of drm.h in via_drm.h Gabriel Laskar
2015-11-30 14:10 ` [PATCH 20/20] drm: via: remove userland header Gabriel Laskar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1448892658-14256-19-git-send-email-gabriel@lse.epita.fr \
    --to=gabriel@lse.epita.fr \
    --cc=airlied@linux.ie \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=emil.l.velikov@gmail.com \
    --cc=linux-api@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mikko.rapeli@iki.fi \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).