From owner-p4-projects@FreeBSD.ORG Sat Feb 19 21:36:10 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9BA3E16A4D0; Sat, 19 Feb 2005 21:36:10 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4981C16A4CF for ; Sat, 19 Feb 2005 21:36:10 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B9D5543D39 for ; Sat, 19 Feb 2005 21:36:09 +0000 (GMT) (envelope-from anholt@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j1JLa9ca064964 for ; Sat, 19 Feb 2005 21:36:09 GMT (envelope-from anholt@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j1JLa9GU064961 for perforce@freebsd.org; Sat, 19 Feb 2005 21:36:09 GMT (envelope-from anholt@freebsd.org) Date: Sat, 19 Feb 2005 21:36:09 GMT Message-Id: <200502192136.j1JLa9GU064961@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to anholt@freebsd.org using -f From: Eric Anholt To: Perforce Change Reviews Subject: PERFORCE change 71341 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Feb 2005 21:36:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=71341 Change 71341 by anholt@anholt_leguin on 2005/02/19 21:35:26 Fix up more include paths. Affected files ... .. //depot/projects/drm-merge/sys/dev/drm/ati_pcigart.c#2 edit .. //depot/projects/drm-merge/sys/dev/drm/drm_agpsupport.c#2 edit .. //depot/projects/drm-merge/sys/dev/drm/drm_auth.c#2 edit .. //depot/projects/drm-merge/sys/dev/drm/drm_bufs.c#2 edit .. //depot/projects/drm-merge/sys/dev/drm/drm_context.c#2 edit .. //depot/projects/drm-merge/sys/dev/drm/drm_dma.c#2 edit .. //depot/projects/drm-merge/sys/dev/drm/drm_drawable.c#2 edit .. //depot/projects/drm-merge/sys/dev/drm/drm_drv.c#2 edit .. //depot/projects/drm-merge/sys/dev/drm/drm_fops.c#2 edit .. //depot/projects/drm-merge/sys/dev/drm/drm_ioctl.c#2 edit .. //depot/projects/drm-merge/sys/dev/drm/drm_irq.c#2 edit .. //depot/projects/drm-merge/sys/dev/drm/drm_lock.c#2 edit .. //depot/projects/drm-merge/sys/dev/drm/drm_memory.c#2 edit .. //depot/projects/drm-merge/sys/dev/drm/drm_pci.c#2 edit .. //depot/projects/drm-merge/sys/dev/drm/drm_scatter.c#2 edit .. //depot/projects/drm-merge/sys/dev/drm/drm_sysctl.c#2 edit .. //depot/projects/drm-merge/sys/dev/drm/drm_vm.c#2 edit .. //depot/projects/drm-merge/sys/dev/drm/mach64_dma.c#2 edit .. //depot/projects/drm-merge/sys/dev/drm/mach64_drv.c#2 edit .. //depot/projects/drm-merge/sys/dev/drm/mach64_irq.c#2 edit .. //depot/projects/drm-merge/sys/dev/drm/mach64_state.c#2 edit Differences ... ==== //depot/projects/drm-merge/sys/dev/drm/ati_pcigart.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ * */ -#include "drmP.h" +#include "dev/drm/drmP.h" #if PAGE_SIZE == 8192 # define ATI_PCIGART_TABLE_ORDER 2 ==== //depot/projects/drm-merge/sys/dev/drm/drm_agpsupport.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ * */ -#include "drmP.h" +#include "dev/drm/drmP.h" #ifdef __FreeBSD__ #include ==== //depot/projects/drm-merge/sys/dev/drm/drm_auth.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ * */ -#include "drmP.h" +#include "dev/drm/drmP.h" static int drm_hash_magic(drm_magic_t magic) { ==== //depot/projects/drm-merge/sys/dev/drm/drm_bufs.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ * */ -#include "drmP.h" +#include "dev/drm/drmP.h" /* * Compute order. Can be made faster. ==== //depot/projects/drm-merge/sys/dev/drm/drm_context.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ * */ -#include "drmP.h" +#include "dev/drm/drmP.h" /* ================================================================ * Context bitmap support ==== //depot/projects/drm-merge/sys/dev/drm/drm_dma.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ * */ -#include "drmP.h" +#include "dev/drm/drmP.h" int drm_dma_setup(drm_device_t *dev) { ==== //depot/projects/drm-merge/sys/dev/drm/drm_drawable.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ * */ -#include "drmP.h" +#include "dev/drm/drmP.h" int drm_adddraw(DRM_IOCTL_ARGS) { ==== //depot/projects/drm-merge/sys/dev/drm/drm_drv.c#2 (text+ko) ==== @@ -30,8 +30,8 @@ * */ -#include "drmP.h" -#include "drm.h" +#include "dev/drm/drmP.h" +#include "dev/drm/drm.h" int drm_debug_flag = 0; ==== //depot/projects/drm-merge/sys/dev/drm/drm_fops.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ * */ -#include "drmP.h" +#include "dev/drm/drmP.h" drm_file_t *drm_find_file_by_proc(drm_device_t *dev, DRM_STRUCTPROC *p) { ==== //depot/projects/drm-merge/sys/dev/drm/drm_ioctl.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ * */ -#include "drmP.h" +#include "dev/drm/drmP.h" /* * Beginning in revision 1.1 of the DRM interface, getunique will return ==== //depot/projects/drm-merge/sys/dev/drm/drm_irq.c#2 (text+ko) ==== @@ -27,8 +27,8 @@ * */ -#include "drmP.h" -#include "drm.h" +#include "dev/drm/drmP.h" +#include "dev/drm/drm.h" int drm_irq_by_busid(DRM_IOCTL_ARGS) { ==== //depot/projects/drm-merge/sys/dev/drm/drm_lock.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ * */ -#include "drmP.h" +#include "dev/drm/drmP.h" int drm_lock_take(__volatile__ unsigned int *lock, unsigned int context) { ==== //depot/projects/drm-merge/sys/dev/drm/drm_memory.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ * */ -#include "drmP.h" +#include "dev/drm/drmP.h" MALLOC_DEFINE(M_DRM, "drm", "DRM Data Structures"); ==== //depot/projects/drm-merge/sys/dev/drm/drm_pci.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "drmP.h" +#include "dev/drm/drmP.h" /**********************************************************************/ /** \name PCI memory */ ==== //depot/projects/drm-merge/sys/dev/drm/drm_scatter.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * */ -#include "drmP.h" +#include "dev/drm/drmP.h" #define DEBUG_SCATTER 0 ==== //depot/projects/drm-merge/sys/dev/drm/drm_sysctl.c#2 (text+ko) ==== @@ -21,8 +21,8 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "drmP.h" -#include "drm.h" +#include "dev/drm/drmP.h" +#include "dev/drm/drm.h" #include ==== //depot/projects/drm-merge/sys/dev/drm/drm_vm.c#2 (text+ko) ==== @@ -21,8 +21,8 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "drmP.h" -#include "drm.h" +#include "dev/drm/drmP.h" +#include "dev/drm/drm.h" #if defined(__FreeBSD__) && __FreeBSD_version >= 500102 int drm_mmap(struct cdev *kdev, vm_offset_t offset, vm_paddr_t *paddr, ==== //depot/projects/drm-merge/sys/dev/drm/mach64_dma.c#2 (text+ko) ==== @@ -34,10 +34,10 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "drmP.h" -#include "drm.h" -#include "mach64_drm.h" -#include "mach64_drv.h" +#include "dev/drm/drmP.h" +#include "dev/drm/drm.h" +#include "dev/drm/mach64_drm.h" +#include "dev/drm/mach64_drv.h" /*******************************************************************/ /** \name Engine, FIFO control */ ==== //depot/projects/drm-merge/sys/dev/drm/mach64_drv.c#2 (text+ko) ==== @@ -32,11 +32,11 @@ #include -#include "drmP.h" -#include "drm.h" -#include "mach64_drm.h" -#include "mach64_drv.h" -#include "drm_pciids.h" +#include "dev/drm/drmP.h" +#include "dev/drm/drm.h" +#include "dev/drm/mach64_drm.h" +#include "dev/drm/mach64_drv.h" +#include "dev/drm/drm_pciids.h" /* drv_PCI_IDs comes from drm_pciids.h, generated from drm_pciids.txt. */ static drm_pci_id_list_t mach64_pciidlist[] = { ==== //depot/projects/drm-merge/sys/dev/drm/mach64_irq.c#2 (text+ko) ==== @@ -34,10 +34,10 @@ * Leif Delgass */ -#include "drmP.h" -#include "drm.h" -#include "mach64_drm.h" -#include "mach64_drv.h" +#include "dev/drm/drmP.h" +#include "dev/drm/drm.h" +#include "dev/drm/mach64_drm.h" +#include "dev/drm/mach64_drv.h" irqreturn_t mach64_driver_irq_handler(DRM_IRQ_ARGS) { ==== //depot/projects/drm-merge/sys/dev/drm/mach64_state.c#2 (text+ko) ==== @@ -29,10 +29,10 @@ * Jos�Fonseca */ -#include "drmP.h" -#include "drm.h" -#include "mach64_drm.h" -#include "mach64_drv.h" +#include "dev/drm/drmP.h" +#include "dev/drm/drm.h" +#include "dev/drm/mach64_drm.h" +#include "dev/drm/mach64_drv.h" /* Interface history: *