[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20110728155252.16618.84586.stgit@warthog.procyon.org.uk>
Date: Thu, 28 Jul 2011 16:52:52 +0100
From: David Howells <dhowells@...hat.com>
To: torvalds@...l.org
Cc: linux-kernel@...r.kernel.org, linux-kbuild@...r.kernel.org,
David Howells <dhowells@...hat.com>
Subject: [PATCH 22/40] UAPI: Fix drmP.h to use #include <...> when referring
to system header files [ver #3]
Fix drmP.h to use #include <...> when referring to system header files to make
sure the UAPI header defaulting works correctly. The -I flag to include/drm/
should be removed at some point.
Signed-off-by: David Howells <dhowells@...hat.com>
---
include/drm/drmP.h | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 6fd0f16..37d0e99 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -73,7 +73,11 @@
#include <linux/workqueue.h>
#include <linux/poll.h>
#include <asm/pgalloc.h>
+#ifdef __KERNEL__
#include <drm/drm.h>
+#else
+#include "drm.h"
+#endif
#include <linux/idr.h>
@@ -83,9 +87,15 @@
struct drm_file;
struct drm_device;
+#ifdef __KERNEL__
#include <drm/drm_os_linux.h>
#include <drm/drm_hashtab.h>
#include <drm/drm_mm.h>
+#else
+#include "drm_os_linux.h"
+#include "drm_hashtab.h"
+#include "drm_mm.h"
+#endif
#define DRM_UT_CORE 0x01
#define DRM_UT_DRIVER 0x02
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists