diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-06-06 20:21:25 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-06-06 20:21:28 +0200 |
commit | 75b5032212641f6d38ac041416945e70da833b68 (patch) | |
tree | bb827401e00c1681a29e75ade3b4ecc903df1a54 /drivers/gpu/drm/i915/intel_dvo.c | |
parent | perf_counter tools: Add 'perf annotate' feature (diff) | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anh... (diff) | |
download | linux-75b5032212641f6d38ac041416945e70da833b68.tar.xz linux-75b5032212641f6d38ac041416945e70da833b68.zip |
Merge branch 'linus' into perfcounters/core
Merge reason: Pick up the latest fixes before the -v8 perfcounters
release.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dvo.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_dvo.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c index 8b8d6e65cd3f..1ee3007d6ec0 100644 --- a/drivers/gpu/drm/i915/intel_dvo.c +++ b/drivers/gpu/drm/i915/intel_dvo.c @@ -316,6 +316,7 @@ static const struct drm_encoder_helper_funcs intel_dvo_helper_funcs = { }; static const struct drm_connector_funcs intel_dvo_connector_funcs = { + .dpms = drm_helper_connector_dpms, .save = intel_dvo_save, .restore = intel_dvo_restore, .detect = intel_dvo_detect, |