From: Imre Deak Date: Mon, 25 Nov 2013 15:15:31 +0000 (+0200) Subject: drm/i915: use IS_HASWELL/BROADWELL instead of HAS_POWER_WELL X-Git-Tag: v3.14-rc1~47^2~90^2~19 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=190be112fc02f6efcf954a82bd49e2c19b3673e8;p=pandora-kernel.git drm/i915: use IS_HASWELL/BROADWELL instead of HAS_POWER_WELL In intel_display_capture_error_state we use HAS_POWER_WELL to check if we are running on Haswell/Broadwell when accessing HSW_PWR_WELL_DRIVER which is specific to these platforms. Future platforms with power wells don't have this register, so HAS_POWER_WELL won't work there any more. Use IS_HASWELL/IS_BROADWELL instead. v3: fix using logical || instead of bitwise | (Paulo) Signed-off-by: Imre Deak Reviewed-by: Paulo Zanoni Signed-off-by: Daniel Vetter --- Reading git-diff-tree failed