diff options
author | Jani Nikula <jani.nikula@intel.com> | 2018-09-26 11:24:04 +0300 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2018-09-26 11:24:04 +0300 |
commit | 2863b00941bc3062ea3299ed4057acfd9e52c335 (patch) | |
tree | bf378837a55e57e4189e9877170fd2b0d288f587 /drivers/gpu/drm/i915/i915_utils.h | |
parent | fc3fed5d297b51f9e2c7d4f969c95c0d6e50ca57 (diff) | |
parent | 36c9c3c91128e2b892c9be0dd9ee9bd82cbe82ad (diff) | |
download | linux-2863b00941bc3062ea3299ed4057acfd9e52c335.tar.xz |
Merge drm/drm-next into drm-intel-next-queued
Catch up in general, and get DP_EXTENDED_RECEIVER_CAP_FIELD_PRESENT
specifically.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_utils.h')
-rw-r--r-- | drivers/gpu/drm/i915/i915_utils.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_utils.h b/drivers/gpu/drm/i915/i915_utils.h index 00165ad55fb3..395dd2511568 100644 --- a/drivers/gpu/drm/i915/i915_utils.h +++ b/drivers/gpu/drm/i915/i915_utils.h @@ -43,7 +43,7 @@ #define MISSING_CASE(x) WARN(1, "Missing case (%s == %ld)\n", \ __stringify(x), (long)(x)) -#if GCC_VERSION >= 70000 +#if defined(GCC_VERSION) && GCC_VERSION >= 70000 #define add_overflows(A, B) \ __builtin_add_overflow_p((A), (B), (typeof((A) + (B)))0) #else |