summaryrefslogtreecommitdiff
path: root/bsd-core
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2007-11-15 15:04:19 +1100
committerDave Airlie <airlied@linux.ie>2007-11-15 15:04:19 +1100
commitf0fe478c1587780690edc465d957a762e02acc8a (patch)
treede129251264e7c4fa5c8c7119583dc18af9a3fab /bsd-core
parente1bc147ac9aa8ac2ac271b0a21f4138b17875ce5 (diff)
parent62cdc6dbb3545d21bc3a68987d0781f277ae6ee4 (diff)
Merge branch 'master' into modesetting-101
Conflicts: shared-core/i915_dma.c tests/ttmtest/src/ttmtest.c
Diffstat (limited to 'bsd-core')
-rw-r--r--bsd-core/drmP.h1
l---------bsd-core/drm_internal.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/bsd-core/drmP.h b/bsd-core/drmP.h
index 8a768f0c..9732d509 100644
--- a/bsd-core/drmP.h
+++ b/bsd-core/drmP.h
@@ -108,6 +108,7 @@ typedef struct drm_file drm_file_t;
#include "drm.h"
#include "drm_linux_list.h"
#include "drm_atomic.h"
+#include "drm_internal.h"
#ifdef __FreeBSD__
#include <opt_drm.h>
diff --git a/bsd-core/drm_internal.h b/bsd-core/drm_internal.h
new file mode 120000
index 00000000..b30ef94a
--- /dev/null
+++ b/bsd-core/drm_internal.h
@@ -0,0 +1 @@
+../shared-core/drm_internal.h \ No newline at end of file