Skip to content

Commit

Permalink
drm/i915: only build i915_debugfs.c when CONFIG_DEBUG_FS is enabled
Browse files Browse the repository at this point in the history
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@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Jani Nikula authored and Daniel Vetter committed Dec 16, 2013
1 parent f3c5fe9 commit a57750f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
3 changes: 2 additions & 1 deletion drivers/gpu/drm/i915/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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)
4 changes: 0 additions & 4 deletions drivers/gpu/drm/i915/i915_debugfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@
#include <drm/i915_drm.h>
#include "i915_drv.h"

#if defined(CONFIG_DEBUG_FS)

enum {
ACTIVE_LIST,
INACTIVE_LIST,
Expand Down Expand Up @@ -3282,5 +3280,3 @@ void i915_debugfs_cleanup(struct drm_minor *minor)
drm_debugfs_remove_files(info_list, 1, minor);
}
}

#endif /* CONFIG_DEBUG_FS */

0 comments on commit a57750f

Please sign in to comment.