summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/i915/Kconfig.debug
diff options
context:
space:
mode:
authorJani Nikula <jani.nikula@intel.com>2019-12-11 11:35:37 +0300
committerJani Nikula <jani.nikula@intel.com>2019-12-11 12:13:50 +0300
commit023265ed75d8792ca1d555430a8985511d3f8788 (patch)
tree0940ba6f005f102062e5842b4ec8073ecd583ac0 /drivers/gpu/drm/i915/Kconfig.debug
parent2b68392e638dfa5cf4f7b558f62e3ea4def2e605 (diff)
parente42617b825f8073569da76dc4510bfa019b1c35a (diff)
downloadlinux-023265ed75d8792ca1d555430a8985511d3f8788.tar.xz
Merge drm/drm-next into drm-intel-next-queued
Sync up with v5.5-rc1 to get the updated lock_release() API among other things. Fix the conflict reported by Stephen Rothwell [1]. [1] http://lore.kernel.org/r/20191210093957.5120f717@canb.auug.org.au Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/Kconfig.debug')
-rw-r--r--drivers/gpu/drm/i915/Kconfig.debug2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/Kconfig.debug b/drivers/gpu/drm/i915/Kconfig.debug
index a1cf437d2e99..1cb28c20807c 100644
--- a/drivers/gpu/drm/i915/Kconfig.debug
+++ b/drivers/gpu/drm/i915/Kconfig.debug
@@ -7,7 +7,6 @@ config DRM_I915_WERROR
# We use the dependency on !COMPILE_TEST to not be enabled in
# allmodconfig or allyesconfig configurations
depends on !COMPILE_TEST
- select HEADER_TEST
default n
help
Add -Werror to the build flags for (and only for) i915.ko.
@@ -22,7 +21,6 @@ config DRM_I915_DEBUG
depends on DRM_I915
select DEBUG_FS
select PREEMPT_COUNT
- select REFCOUNT_FULL
select I2C_CHARDEV
select STACKDEPOT
select DRM_DP_AUX_CHARDEV