diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-12-08 03:52:41 (GMT) |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-12-08 03:52:41 (GMT) |
| commit | 1bd049fa895f9c6743f38b52ce14775f5a31ea63 (patch) | |
| tree | cb9163ac1c20f7fbdbde42eaab8013d0c3734aed /include/drm/i915_drm.h | |
| parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
| parent | b0a007dc27d8d3ff3db07b3ea997323d9330f770 (diff) | |
| download | linux-fsl-qoriq-1bd049fa895f9c6743f38b52ce14775f5a31ea63.tar.xz | |
Merge branch 'drm-core-next' into drm-linus
Bring all core drm changes into 2.6.32 tree and resolve
the conflict that occurs.
Conflicts:
drivers/gpu/drm/drm_fb_helper.c
Diffstat (limited to 'include/drm/i915_drm.h')
| -rw-r--r-- | include/drm/i915_drm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h index 7e0cb1d..a04c3ab 100644 --- a/include/drm/i915_drm.h +++ b/include/drm/i915_drm.h @@ -27,11 +27,11 @@ #ifndef _I915_DRM_H_ #define _I915_DRM_H_ +#include "drm.h" + /* Please note that modifications to all structs defined here are * subject to backwards-compatibility constraints. */ -#include <linux/types.h> -#include "drm.h" /* Each region is a minimum of 16k, and there are at most 255 of them. */ |