diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-11 14:19:13 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-11 14:19:13 +1100 |
| commit | fa9a797fea069578ba808a8dc2c761f2905eb51f (patch) | |
| tree | ba6299560664b651b2081f4e2994c0f9a71fc1d0 /drivers/gpu/drm/i915/intel_sdvo.c | |
| parent | 36e0f8e230714bb4a287770ca7bfaeb81c878956 (diff) | |
| parent | e73f88af66fcc50083fae4b7e1c39b469179a97a (diff) | |
Merge remote-tracking branch 'drm/drm-next'
Conflicts:
drivers/gpu/drm/nouveau/nouveau_mem.c
Diffstat (limited to 'drivers/gpu/drm/i915/intel_sdvo.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_sdvo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index 7c50cdce84f0..fefc8d60a835 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c @@ -1482,7 +1482,7 @@ static void intel_sdvo_get_ddc_modes(struct drm_connector *connector) * Note! This is in reply order (see loop in get_tv_modes). * XXX: all 60Hz refresh? */ -struct drm_display_mode sdvo_tv_modes[] = { +static const struct drm_display_mode sdvo_tv_modes[] = { { DRM_MODE("320x200", DRM_MODE_TYPE_DRIVER, 5815, 320, 321, 384, 416, 0, 200, 201, 232, 233, 0, DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, |