[Intel-gfx] [PATCH] drm/i915/opregion: fix build error on CONFIG_ACPI=n

[Daniel Vetter]

On Fri, Nov 08, 2013 at 10:10:31AM +0200, Jani Nikula wrote:
> Fix CONFIG_ACPI=n build fail
> 
>   CC      drivers/gpu/drm/i915/intel_opregion.o
> drivers/gpu/drm/i915/intel_opregion.c: In function ‘intel_opregion_setup’:
> drivers/gpu/drm/i915/intel_opregion.c:879:2: error: ‘asle_work’ undeclared (first use in this function)
> drivers/gpu/drm/i915/intel_opregion.c:879:2: note: each undeclared identifier is reported only once for each function it appears in
> make[4]: *** [drivers/gpu/drm/i915/intel_opregion.o] Error 1
> 
> introduced in
> commit 91a60f20712179e56b7a6c3d332a5f6f9a54aa11
> Author: Jani Nikula <jani.nikula at intel.com>
> Date:   Thu Oct 31 18:55:48 2013 +0200
> 
>     drm/i915: move opregion asle request handling to a work queue
> 
> Reported-by: Jim Davis <jim.epost at gmail.com>
> Reference: http://lkml.kernel.org/r/CA+r1ZhjcFpr5KKVX0pLCOP8cAyZoiYO=UyqYMJtNSV-Kt_p7xQ@mail.gmail.com
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>

Picked up for -fixes, thanks for the patch.
-Daniel

> ---
>  drivers/gpu/drm/i915/intel_opregion.c |    2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
> index 91b68dc..1b2f41c 100644
> --- a/drivers/gpu/drm/i915/intel_opregion.c
> +++ b/drivers/gpu/drm/i915/intel_opregion.c
> @@ -876,7 +876,9 @@ int intel_opregion_setup(struct drm_device *dev)
>  		return -ENOTSUPP;
>  	}
>  
> +#ifdef CONFIG_ACPI
>  	INIT_WORK(&opregion->asle_work, asle_work);
> +#endif
>  
>  	base = acpi_os_ioremap(asls, OPREGION_SIZE);
>  	if (!base)
> -- 
> 1.7.9.5
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch