CVS Update: xc (branch: trunk)

[Kevin E Martin]

CVSROOT:	/cvs/xorg
Module name:	xc
Changes by:	kem at gabe.freedesktop.org	05/10/17 19:49:48

Log message:
  Resolve drm import conflicts

Modified files:
      xc/extras/drm/linux/:
        Makefile Makefile.kernel drmP.h drm_drv.h 
      xc/extras/drm/shared/:
        i915_drv.h mga_drm.h 
Removed files:
      xc/extras/drm/bsd/:
        .cvsignore Makefile ati_pcigart.h drmP.h drm_agpsupport.h 
        drm_auth.h drm_bufs.h drm_context.h drm_dma.h 
        drm_drawable.h drm_drv.h drm_fops.h drm_ioctl.h drm_irq.h 
        drm_linux_list.h drm_lock.h drm_memory.h 
        drm_memory_debug.h drm_os_freebsd.h drm_os_netbsd.h 
        drm_pci.h drm_scatter.h drm_sysctl.h drm_vm.h i915_drv.c 
        mach64_drv.c mga_drv.c r128_drv.c radeon_drv.c sis_drv.c 
        tdfx_drv.c 
      xc/extras/drm/bsd/i915/:
        Makefile 
      xc/extras/drm/bsd/mach64/:
        .cvsignore Makefile 
      xc/extras/drm/bsd/mga/:
        .cvsignore Makefile 
      xc/extras/drm/bsd/r128/:
        .cvsignore Makefile 
      xc/extras/drm/bsd/radeon/:
        .cvsignore Makefile 
      xc/extras/drm/bsd/sis/:
        .cvsignore Makefile 
      xc/extras/drm/bsd/tdfx/:
        .cvsignore Makefile 
      xc/extras/drm/libdrm/:
        Makefile 
      xc/extras/drm/linux/:
        drm_pm.h 
      xc/extras/drm/linux-2.6/:
        README 
      xc/extras/drm/linux-core/:
        drm_pm.c radeon_i2c.c radeon_i2c.h 
      xc/extras/drm/shared/:
        i915_pm.c 
      xc/extras/drm/shared-core/:
        i915_pm.c 
  
  Revision      Changes    Path
  1.4           +1 -2      xc/extras/drm/linux/Makefile
  http://cvs.freedesktop.org/xorg/xc/extras/drm/linux/Makefile
  1.4           +1 -1      xc/extras/drm/linux/Makefile.kernel
  http://cvs.freedesktop.org/xorg/xc/extras/drm/linux/Makefile.kernel
  1.4           +0 -15     xc/extras/drm/linux/drmP.h
  http://cvs.freedesktop.org/xorg/xc/extras/drm/linux/drmP.h
  1.4           +0 -4      xc/extras/drm/linux/drm_drv.h
  http://cvs.freedesktop.org/xorg/xc/extras/drm/linux/drm_drv.h
  1.4           +0 -9      xc/extras/drm/shared/i915_drv.h
  http://cvs.freedesktop.org/xorg/xc/extras/drm/shared/i915_drv.h
  1.3           +0 -2      xc/extras/drm/shared/mga_drm.h
  http://cvs.freedesktop.org/xorg/xc/extras/drm/shared/mga_drm.h