diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-12-07 22:52:41 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-12-07 22:52:41 -0500 |
| commit | 1bd049fa895f9c6743f38b52ce14775f5a31ea63 (patch) | |
| tree | cb9163ac1c20f7fbdbde42eaab8013d0c3734aed /include/drm/mga_drm.h | |
| parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
| parent | b0a007dc27d8d3ff3db07b3ea997323d9330f770 (diff) | |
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/mga_drm.h')
| -rw-r--r-- | include/drm/mga_drm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/drm/mga_drm.h b/include/drm/mga_drm.h index 325fd6fb4a42..3ffbc4798afa 100644 --- a/include/drm/mga_drm.h +++ b/include/drm/mga_drm.h | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | #ifndef __MGA_DRM_H__ | 35 | #ifndef __MGA_DRM_H__ |
| 36 | #define __MGA_DRM_H__ | 36 | #define __MGA_DRM_H__ |
| 37 | 37 | ||
| 38 | #include <linux/types.h> | 38 | #include "drm.h" |
| 39 | 39 | ||
| 40 | /* WARNING: If you change any of these defines, make sure to change the | 40 | /* WARNING: If you change any of these defines, make sure to change the |
| 41 | * defines in the Xserver file (mga_sarea.h) | 41 | * defines in the Xserver file (mga_sarea.h) |