diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-05-26 08:46:21 +0300 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-05-26 08:46:21 +0300 |
| commit | 908d759b210effb33d927a8cb6603a16448474e4 (patch) | |
| tree | 6dfa818883ef7daa48407ea26d1d27b61e741705 /drivers | |
| parent | 82d5b58f13fcc5459cd9c61a9d6d4a07328a31dc (diff) | |
| download | linux-908d759b210effb33d927a8cb6603a16448474e4.tar.xz | |
Revert "drm/i915: Force clean compilation with -Werror"
This reverts commit 118182e9d7d5afa0c7c10f568afb46ab78b462e9.
It's causing too much trouble when compile-testing for non-i915 folks.
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/i915/Kconfig | 8 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/Kconfig.debug | 5 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/Makefile | 2 |
3 files changed, 0 insertions, 15 deletions
diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig index 5e3aa87e8f48..74acca9bcd9d 100644 --- a/drivers/gpu/drm/i915/Kconfig +++ b/drivers/gpu/drm/i915/Kconfig @@ -71,11 +71,3 @@ config DRM_I915_PRELIMINARY_HW_SUPPORT option changes the default for that module option. If in doubt, say "N". - -menu "DRM i915 Debugging" - -depends on DRM_I915 - -source drivers/gpu/drm/i915/Kconfig.debug - -endmenu diff --git a/drivers/gpu/drm/i915/Kconfig.debug b/drivers/gpu/drm/i915/Kconfig.debug deleted file mode 100644 index 070a03527bc5..000000000000 --- a/drivers/gpu/drm/i915/Kconfig.debug +++ /dev/null @@ -1,5 +0,0 @@ -config DRM_I915_WERROR - bool "Force GCC to throw an error instead of a warning when compiling" - default n - ---help--- - Add -Werror to the build flags for (and only for) i915.ko diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile index 93d99b744531..b7ddf48e1d75 100644 --- a/drivers/gpu/drm/i915/Makefile +++ b/drivers/gpu/drm/i915/Makefile @@ -2,8 +2,6 @@ # Makefile for the drm device driver. This driver provides support for the # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. -subdir-ccflags-$(CONFIG_DRM_I915_WERROR) := -Werror - # Please keep these build lists sorted! # core driver code |