Re: [PATCH] drm/i915: fix build for DEBUG_FS=n

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Fri, Apr 10, 2015 at 04:59:32PM +0300, Jani Nikula wrote:
> Fix DEBUG_FS=n build broken by
> 
> commit aa7471d228eb6dfddd0d201ea9746d6a2020972a
> Author: Jani Nikula <jani.nikula@xxxxxxxxx>
> Date:   Wed Apr 1 11:15:21 2015 +0300
> 
>     drm/i915: add i915 specific connector debugfs file for DPCD
> 
> Reported-by: kbuild test robot <fengguang.wu@xxxxxxxxx>
> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>

Queued for -next, thanks for the patch.
-Daniel
> ---
>  drivers/gpu/drm/i915/i915_drv.h | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 822f2591e3c5..8cbb20cd63e6 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -3029,10 +3029,11 @@ int i915_verify_lists(struct drm_device *dev);
>  /* i915_debugfs.c */
>  int i915_debugfs_init(struct drm_minor *minor);
>  void i915_debugfs_cleanup(struct drm_minor *minor);
> -int i915_debugfs_connector_add(struct drm_connector *connector);
>  #ifdef CONFIG_DEBUG_FS
> +int i915_debugfs_connector_add(struct drm_connector *connector);
>  void intel_display_crc_init(struct drm_device *dev);
>  #else
> +static inline int i915_debugfs_connector_add(struct drm_connector *connector) {}
>  static inline void intel_display_crc_init(struct drm_device *dev) {}
>  #endif
>  
> -- 
> 2.1.4
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx





[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]
  Powered by Linux