CVS Update: xc (branch: trunk)

[Ian Romanick]

CVSROOT:	/cvs/xorg
Module name:	xc
Changes by:	idr at gabe.freedesktop.org	05/06/15 12:05:06

Log message:
  Fix conflicts from DRM 20050615 import

Modified files:
      ./:
        ChangeLog 
      xc/extras/drm/linux/:
        Makefile Makefile.kernel drmP.h drm_drv.h drm_os_linux.h 
        i915_drv.c 
      xc/extras/drm/shared/:
        drm.h drm_pciids.txt i915.h i915_drv.h 
Removed files:
      xc/extras/drm/linux/:
        gamma.h gamma_context.h gamma_dma.c gamma_drm.h 
        gamma_drv.c gamma_drv.h gamma_lists.h gamma_lock.h 
        gamma_old_dma.h 
  
  Revision      Changes    Path
  1.1008        +12 -9     xc/ChangeLog
  1.3           +13 -13    xc/extras/drm/linux/Makefile
  1.3           +3 -7      xc/extras/drm/linux/Makefile.kernel
  1.3           +178 -133  xc/extras/drm/linux/drmP.h
  1.3           +294 -464  xc/extras/drm/linux/drm_drv.h
  1.3           +27 -8     xc/extras/drm/linux/drm_os_linux.h
  1.3           +1 -16     xc/extras/drm/linux/i915_drv.c
  1.3           +60 -24    xc/extras/drm/shared/drm.h
  1.3           +185 -170  xc/extras/drm/shared/drm_pciids.txt
  1.3           +0 -47     xc/extras/drm/shared/i915.h
  1.3           +34 -43    xc/extras/drm/shared/i915_drv.h