From: Len Brown Date: Sat, 28 Mar 2009 05:41:14 +0000 (-0400) Subject: ACPI: fix CONFIG_ACPI=n build X-Git-Tag: v2.6.30-rc1~199^2~16^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=03ae61dd5701092aabb60a8cae9929dbf8dc25c6;p=thirdparty%2Fkernel%2Flinux.git ACPI: fix CONFIG_ACPI=n build drivers/gpu/drm/i915/i915_drv.c:102: error: too many arguments to function ‘intel_opregion_init’ Signed-off-by: Len Brown --- diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 1679a951aa7eb..b9a92c250b913 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/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; }