-
Daniel Vetter authored
After unifying i915 and i965, not much will be left of these files. Therefore merge them to make the following changes easier. This creates some warnings about some redefined macros, but when this is all cleaned up they'll all be gone. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
ebc0ffba