diff options
author | Jesse Barnes <jbarnes@jbarnes-mobile.amr.corp.intel.com> | 2007-09-24 14:41:46 -0700 |
---|---|---|
committer | Jesse Barnes <jbarnes@jbarnes-mobile.amr.corp.intel.com> | 2007-09-24 14:41:46 -0700 |
commit | 5cc3083179b19678456905a9122a3d0f04e6f623 (patch) | |
tree | 9b776bdd317aa5af68b7cbf8fabde12e20eccf8a /linux-core/drm_edid.c | |
parent | 2a2d02bbc500140a861380df52ce66abcac39312 (diff) | |
parent | 54df1b9ff3b79097fedd8ed7bf54aca30a660cbd (diff) |
Merge branch 'master' into modesetting-101 - TTM & typedef removal
Conflicts:
linux-core/drmP.h
linux-core/drm_bo.c
linux-core/drm_drv.c
linux-core/drm_objects.h
shared-core/drm.h
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
Mostly removing typedefs that snuck into the modesetting code and
updating to the latest TTM APIs. As of today, the i915 driver builds,
but there are likely to be problems, so debugging and bugfixes will
come next.
Diffstat (limited to 'linux-core/drm_edid.c')
-rw-r--r-- | linux-core/drm_edid.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-core/drm_edid.c b/linux-core/drm_edid.c index 0d067929..d7d3939a 100644 --- a/linux-core/drm_edid.c +++ b/linux-core/drm_edid.c @@ -94,7 +94,7 @@ struct drm_display_mode *drm_mode_std(struct drm_device *dev, * if this is the display's preferred timing, and we'll use it to indicate * to the other layers that this mode is desired. */ -struct drm_display_mode *drm_mode_detailed(drm_device_t *dev, +struct drm_display_mode *drm_mode_detailed(struct drm_device *dev, struct detailed_timing *timing) { struct drm_display_mode *mode; |