drm/i915: Remove regfile code&data for UMS suspend/resume
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 23 Feb 2015 11:03:30 +0000 (12:03 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 27 Feb 2015 17:10:39 +0000 (18:10 +0100)
Lots of lines to remove!

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
[danvet: Fixup makefile.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/Makefile
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_suspend.c
drivers/gpu/drm/i915/i915_ums.c [deleted file]

Simple merge
Simple merge
Simple merge
diff --cc drivers/gpu/drm/i915/i915_ums.c
Simple merge