On Mon, Dec 16, 2013 at 01:10:36PM +0200, Jani Nikula wrote:
> The whole file is wrapped around in #if defined(CONFIG_DEBUG_FS) anyway,
> so skip the file at the build level already.
>
> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
Queued for -next, thanks for the patch.
-Daniel
> ---
> drivers/gpu/drm/i915/Makefile | 3 ++-
> drivers/gpu/drm/i915/i915_debugfs.c | 4 ----
> 2 files changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
> index 41838eaa799c..da682cbcb806 100644
> --- a/drivers/gpu/drm/i915/Makefile
> +++ b/drivers/gpu/drm/i915/Makefile
> @@ -4,7 +4,6 @@
>
> ccflags-y := -Iinclude/drm
> i915-y := i915_drv.o i915_dma.o i915_irq.o \
> - i915_debugfs.o \
> i915_gpu_error.o \
> i915_suspend.o \
> i915_gem.o \
> @@ -55,6 +54,8 @@ i915-$(CONFIG_ACPI) += intel_acpi.o
>
> i915-$(CONFIG_DRM_I915_FBDEV) += intel_fbdev.o
>
> +i915-$(CONFIG_DEBUG_FS) += i915_debugfs.o
> +
> obj-$(CONFIG_DRM_I915) += i915.o
>
> CFLAGS_i915_trace_points.o := -I$(src)
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index 242189ee3607..6294ffdcc0ac 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -40,8 +40,6 @@
> #include <drm/i915_drm.h>
> #include "i915_drv.h"
>
> -#if defined(CONFIG_DEBUG_FS)
> -
> enum {
> ACTIVE_LIST,
> INACTIVE_LIST,
> @@ -3282,5 +3280,3 @@ void i915_debugfs_cleanup(struct drm_minor *minor)
> drm_debugfs_remove_files(info_list, 1, minor);
> }
> }
> -
> -#endif /* CONFIG_DEBUG_FS */
> --
> 1.7.9.5
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
