diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-04 15:23:39 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-04 15:23:39 -0700 |
commit | b63254c71a46d7af2e3f00342b0592dfcd77b342 (patch) | |
tree | cdf9a2b48358b1843bf4e67bb80dde490d04c1fc /drivers/gpu/drm/i915/intel_sdvo.c | |
parent | 730c586ad5228c339949b2eb4e72b80ae167abc4 (diff) | |
parent | fc43896630a421321a19d7970bac27ac94e9d162 (diff) | |
download | op-kernel-dev-b63254c71a46d7af2e3f00342b0592dfcd77b342.zip op-kernel-dev-b63254c71a46d7af2e3f00342b0592dfcd77b342.tar.gz |
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm: ignore EDID with really tiny modes.
drm: don't associate _DRM_DRIVER maps with a master
drm/i915: intel_lvds.c fix section mismatch
drm: Hook up DPMS property handling in drm_crtc.c. Add drm_helper_connector_dpms.
drm: set permissions on edid file to 0444
drm: add newlines to text sysfs files
drm/radeon: fix ring free alignment calculations
drm: fix irq naming for kms drivers.
Diffstat (limited to 'drivers/gpu/drm/i915/intel_sdvo.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_sdvo.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index f3ef6bf..3093b4d 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c @@ -1616,6 +1616,7 @@ static const struct drm_encoder_helper_funcs intel_sdvo_helper_funcs = { }; static const struct drm_connector_funcs intel_sdvo_connector_funcs = { + .dpms = drm_helper_connector_dpms, .save = intel_sdvo_save, .restore = intel_sdvo_restore, .detect = intel_sdvo_detect, |