diff options
| author | Keith Packard <keithp@keithp.com> | 2011-06-29 13:47:53 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-06-29 13:47:53 -0700 |
| commit | e489bda422b0a2c2cc33e598a4d400dfe654ad64 (patch) | |
| tree | 0f055735666904294bee29027f75575e710aeab8 /drivers/gpu/drm/i915/i915_drv.h | |
| parent | 1c70c0cebd1295a42fec75045b8a6b4419cedef3 (diff) | |
| parent | dc501fbc4389f6c15a8da14684b5926e0d9553da (diff) | |
| download | talos-obmc-linux-e489bda422b0a2c2cc33e598a4d400dfe654ad64.tar.gz talos-obmc-linux-e489bda422b0a2c2cc33e598a4d400dfe654ad64.zip | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index e0f9ca3e5ff8..7a7a4216d4f8 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -998,8 +998,6 @@ extern bool i915_enable_hangcheck; extern int i915_suspend(struct drm_device *dev, pm_message_t state); extern int i915_resume(struct drm_device *dev); -extern void i915_save_display(struct drm_device *dev); -extern void i915_restore_display(struct drm_device *dev); extern int i915_master_create(struct drm_device *dev, struct drm_master *master); extern void i915_master_destroy(struct drm_device *dev, struct drm_master *master); |
