diff options
| author | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2007-04-12 15:10:08 +0100 |
|---|---|---|
| committer | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2007-04-12 15:10:08 +0100 |
| commit | 9420ab4b419458605c678d179de6c80de23b8ee1 (patch) | |
| tree | 9fb796bbcc3b80f7e89029bc5fd4668554d698ea /linux-core/drmP.h | |
| parent | 9b7211dd6793dc62d11ad1ae980b22fa2d61f9dd (diff) | |
| parent | b1f0fd6dfbd1495aa08c6358e936582eeca042c8 (diff) | |
Merge remote branch 'origin/modesetting-101' into modesetting-101
Diffstat (limited to 'linux-core/drmP.h')
| -rw-r--r-- | linux-core/drmP.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h index d879c2a2..ac0bd767 100644 --- a/linux-core/drmP.h +++ b/linux-core/drmP.h @@ -75,6 +75,7 @@ #include <linux/poll.h> #include <asm/pgalloc.h> #include "drm.h" +#include "drm_crtc.h" #include <linux/slab.h> #define __OS_HAS_AGP (defined(CONFIG_AGP) || (defined(CONFIG_AGP_MODULE) && defined(MODULE))) @@ -164,6 +165,8 @@ #include "drm_compat.h" +#include "drm_crtc.h" + /***********************************************************************/ /** \name Macros to make printk easier */ /*@{*/ @@ -831,6 +834,9 @@ typedef struct drm_device { unsigned int drw_info_length; drm_drawable_info_t **drw_info; /*@} */ + + /* DRM mode setting */ + struct drm_mode_config mode_config; } drm_device_t; #if __OS_HAS_AGP |