From e6111d6c48473eed40d2f22ae378fb25c8594e6d Mon Sep 17 00:00:00 2001 From: Len Brown Date: Sat, 28 Mar 2009 01:41:14 -0400 Subject: [PATCH] --- yaml --- r: 141920 b: refs/heads/master c: 03ae61dd5701092aabb60a8cae9929dbf8dc25c6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_drv.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b75cee02d7b9..e27833097134 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 98758faffc86ee6fe9504eeab75481ee7c1aa860 +refs/heads/master: 03ae61dd5701092aabb60a8cae9929dbf8dc25c6 diff --git a/trunk/drivers/gpu/drm/i915/i915_drv.h b/trunk/drivers/gpu/drm/i915/i915_drv.h index 1679a951aa7e..b9a92c250b91 100644 --- a/trunk/drivers/gpu/drm/i915/i915_drv.h +++ b/trunk/drivers/gpu/drm/i915/i915_drv.h @@ -664,7 +664,7 @@ extern void intel_opregion_free(struct drm_device *dev); extern void opregion_asle_intr(struct drm_device *dev); extern void opregion_enable_asle(struct drm_device *dev); #else -static inline int intel_opregion_init(struct drm_device *dev) { return 0; } +static inline int intel_opregion_init(struct drm_device *dev, int resume) { return 0; } static inline void intel_opregion_free(struct drm_device *dev) { return; } static inline void opregion_asle_intr(struct drm_device *dev) { return; } static inline void opregion_enable_asle(struct drm_device *dev) { return; }