diff options
| author | Keith Packard <keithp@keithp.com> | 2011-09-28 14:44:38 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-09-28 14:44:38 -0700 |
| commit | 0ac225e56997ef89f46eb51b02799a685b78f214 (patch) | |
| tree | 9a7694b8748c08b5c74ab07b4df6d53defd8216f /drivers/gpu/drm/i915/intel_drv.h | |
| parent | 64a742fac3a22f57303d8f1b7e347350a1c48254 (diff) | |
| parent | cd0de039bff32ee314046c0e4c047c38aa696f84 (diff) | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index b7e718639b13..98044d626a8d 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -337,9 +337,6 @@ extern void intel_release_load_detect_pipe(struct intel_encoder *intel_encoder, struct drm_connector *connector, struct intel_load_detect_pipe *old); -extern struct drm_connector* intel_sdvo_find(struct drm_device *dev, int sdvoB); -extern int intel_sdvo_supports_hotplug(struct drm_connector *connector); -extern void intel_sdvo_set_hotplug(struct drm_connector *connector, int enable); extern void intelfb_restore(void); extern void intel_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green, u16 blue, int regno); |