diff options
| author | Dave Airlie <airlied@redhat.com> | 2008-09-26 15:37:21 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2008-09-30 14:13:49 +1000 |
| commit | 972f6572652bc4a2f6c44c525e5e91f2becdb62a (patch) | |
| tree | 60af3dc7e8a7c0f8bef7a3927dae161093b10dbe /shared-core/Makefile.am | |
| parent | 89126bb58ec82511758bed36a28e698b721fb435 (diff) | |
| parent | 2db8e0c8ef8c7a66460fceda129533b364f6418c (diff) | |
Merge remote branch 'origin/master' into modesetting-gem
Conflicts:
libdrm/Makefile.am
libdrm/dri_bufmgr.h
linux-core/drm_irq.c
linux-core/drm_sysfs.c
linux-core/drm_ttm.c
shared-core/i915_dma.c
shared-core/i915_irq.c
shared-core/nouveau_drv.h
shared-core/radeon_cp.c
Diffstat (limited to 'shared-core/Makefile.am')
| -rw-r--r-- | shared-core/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/shared-core/Makefile.am b/shared-core/Makefile.am index 42e08e75..5b65bc67 100644 --- a/shared-core/Makefile.am +++ b/shared-core/Makefile.am @@ -25,6 +25,7 @@ klibdrmincludedir = ${includedir}/drm klibdrminclude_HEADERS = \ drm.h \ + drm_mode.h \ drm_sarea.h \ i915_drm.h \ mach64_drm.h \ |