i915 warning in drm-next

[Dave Airlie]

home/airlied/devel/kernel/drm-next/drivers/gpu/drm/i915/intel_display.c:5217:0:
warning: "for_each_power_domain" redefined
 #define for_each_power_domain(domain, mask)    \
 ^
In file included from
/home/airlied/devel/kernel/drm-next/drivers/gpu/drm/i915/intel_drv.h:32:0,
                 from
/home/airlied/devel/kernel/drm-next/drivers/gpu/drm/i915/intel_display.c:36:
/home/airlied/devel/kernel/drm-next/drivers/gpu/drm/i915/i915_drv.h:312:0:
note: this is the location of the previous definition
 #define for_each_power_domain(domain, mask)    \
 ^
I may have mismerged something.

Dave.