PERFORCE change 71338 for review
Eric Anholt
anholt at FreeBSD.org
Sat Feb 19 13:16:46 PST 2005
http://perforce.freebsd.org/chv.cgi?CH=71338
Change 71338 by anholt at anholt_leguin on 2005/02/19 21:15:47
Fix up some header paths again.
Affected files ...
.. //depot/projects/drm-merge/sys/dev/drm/drmP.h#4 edit
.. //depot/projects/drm-merge/sys/dev/drm/drm_sarea.h#4 edit
.. //depot/projects/drm-merge/sys/dev/drm/mga_dma.c#4 edit
.. //depot/projects/drm-merge/sys/dev/drm/mga_drv.c#4 edit
.. //depot/projects/drm-merge/sys/dev/drm/mga_irq.c#4 edit
.. //depot/projects/drm-merge/sys/dev/drm/mga_state.c#4 edit
.. //depot/projects/drm-merge/sys/dev/drm/mga_warp.c#4 edit
.. //depot/projects/drm-merge/sys/dev/drm/r128_cce.c#4 edit
.. //depot/projects/drm-merge/sys/dev/drm/r128_drv.c#4 edit
.. //depot/projects/drm-merge/sys/dev/drm/r128_irq.c#4 edit
.. //depot/projects/drm-merge/sys/dev/drm/r128_state.c#4 edit
.. //depot/projects/drm-merge/sys/dev/drm/radeon_cp.c#4 edit
.. //depot/projects/drm-merge/sys/dev/drm/radeon_drv.c#4 edit
.. //depot/projects/drm-merge/sys/dev/drm/radeon_irq.c#4 edit
.. //depot/projects/drm-merge/sys/dev/drm/radeon_mem.c#4 edit
.. //depot/projects/drm-merge/sys/dev/drm/radeon_state.c#4 edit
.. //depot/projects/drm-merge/sys/dev/drm/sis_drv.c#4 edit
.. //depot/projects/drm-merge/sys/dev/drm/sis_drv.h#4 edit
.. //depot/projects/drm-merge/sys/dev/drm/sis_ds.c#4 edit
.. //depot/projects/drm-merge/sys/dev/drm/sis_mm.c#4 edit
.. //depot/projects/drm-merge/sys/dev/drm/tdfx_drv.c#4 edit
Differences ...
==== //depot/projects/drm-merge/sys/dev/drm/drmP.h#4 (text+ko) ====
@@ -100,9 +100,9 @@
#endif
#include <sys/bus.h>
-#include "drm.h"
-#include "drm_linux_list.h"
-#include "drm_atomic.h"
+#include "dev/drm/drm.h"
+#include "dev/drm/drm_linux_list.h"
+#include "dev/drm/drm_atomic.h"
#ifdef __FreeBSD__
#include <opt_drm.h>
==== //depot/projects/drm-merge/sys/dev/drm/drm_sarea.h#4 (text+ko) ====
@@ -34,7 +34,7 @@
#ifndef _DRM_SAREA_H_
#define _DRM_SAREA_H_
-#include "drm.h"
+#include "dev/drm/drm.h"
/* SAREA area needs to be at least a page */
#if defined(__alpha__)
==== //depot/projects/drm-merge/sys/dev/drm/mga_dma.c#4 (text+ko) ====
@@ -35,10 +35,10 @@
* $FreeBSD$
*/
-#include "drmP.h"
-#include "drm.h"
-#include "mga_drm.h"
-#include "mga_drv.h"
+#include "dev/drm/drmP.h"
+#include "dev/drm/drm.h"
+#include "dev/drm/mga_drm.h"
+#include "dev/drm/mga_drv.h"
#define MGA_DEFAULT_USEC_TIMEOUT 10000
#define MGA_FREELIST_DEBUG 0
==== //depot/projects/drm-merge/sys/dev/drm/mga_drv.c#4 (text+ko) ====
@@ -31,11 +31,11 @@
* $FreeBSD$
*/
-#include "drmP.h"
-#include "drm.h"
-#include "mga_drm.h"
-#include "mga_drv.h"
-#include "drm_pciids.h"
+#include "dev/drm/drmP.h"
+#include "dev/drm/drm.h"
+#include "dev/drm/mga_drm.h"
+#include "dev/drm/mga_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 mga_pciidlist[] = {
==== //depot/projects/drm-merge/sys/dev/drm/mga_irq.c#4 (text+ko) ====
@@ -32,10 +32,10 @@
* $FreeBSD$
*/
-#include "drmP.h"
-#include "drm.h"
-#include "mga_drm.h"
-#include "mga_drv.h"
+#include "dev/drm/drmP.h"
+#include "dev/drm/drm.h"
+#include "dev/drm/mga_drm.h"
+#include "dev/drm/mga_drv.h"
irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)
{
==== //depot/projects/drm-merge/sys/dev/drm/mga_state.c#4 (text+ko) ====
@@ -35,10 +35,10 @@
* $FreeBSD$
*/
-#include "drmP.h"
-#include "drm.h"
-#include "mga_drm.h"
-#include "mga_drv.h"
+#include "dev/drm/drmP.h"
+#include "dev/drm/drm.h"
+#include "dev/drm/mga_drm.h"
+#include "dev/drm/mga_drv.h"
/* ================================================================
* DMA hardware state programming functions
==== //depot/projects/drm-merge/sys/dev/drm/mga_warp.c#4 (text+ko) ====
@@ -29,11 +29,11 @@
* $FreeBSD$
*/
-#include "drmP.h"
-#include "drm.h"
-#include "mga_drm.h"
-#include "mga_drv.h"
-#include "mga_ucode.h"
+#include "dev/drm/drmP.h"
+#include "dev/drm/drm.h"
+#include "dev/drm/mga_drm.h"
+#include "dev/drm/mga_drv.h"
+#include "dev/drm/mga_ucode.h"
#define MGA_WARP_CODE_ALIGN 256 /* in bytes */
==== //depot/projects/drm-merge/sys/dev/drm/r128_cce.c#4 (text+ko) ====
@@ -30,10 +30,10 @@
* $FreeBSD$
*/
-#include "drmP.h"
-#include "drm.h"
-#include "r128_drm.h"
-#include "r128_drv.h"
+#include "dev/drm/drmP.h"
+#include "dev/drm/drm.h"
+#include "dev/drm/r128_drm.h"
+#include "dev/drm/r128_drv.h"
#define R128_FIFO_DEBUG 0
==== //depot/projects/drm-merge/sys/dev/drm/r128_drv.c#4 (text+ko) ====
@@ -31,11 +31,11 @@
* $FreeBSD$
*/
-#include "drmP.h"
-#include "drm.h"
-#include "r128_drm.h"
-#include "r128_drv.h"
-#include "drm_pciids.h"
+#include "dev/drm/drmP.h"
+#include "dev/drm/drm.h"
+#include "dev/drm/r128_drm.h"
+#include "dev/drm/r128_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 r128_pciidlist[] = {
==== //depot/projects/drm-merge/sys/dev/drm/r128_irq.c#4 (text+ko) ====
@@ -32,10 +32,10 @@
* $FreeBSD$
*/
-#include "drmP.h"
-#include "drm.h"
-#include "r128_drm.h"
-#include "r128_drv.h"
+#include "dev/drm/drmP.h"
+#include "dev/drm/drm.h"
+#include "dev/drm/r128_drm.h"
+#include "dev/drm/r128_drv.h"
irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS)
{
==== //depot/projects/drm-merge/sys/dev/drm/r128_state.c#4 (text+ko) ====
@@ -29,10 +29,10 @@
* $FreeBSD$
*/
-#include "drmP.h"
-#include "drm.h"
-#include "r128_drm.h"
-#include "r128_drv.h"
+#include "dev/drm/drmP.h"
+#include "dev/drm/drm.h"
+#include "dev/drm/r128_drm.h"
+#include "dev/drm/r128_drv.h"
/* ================================================================
* CCE hardware state programming functions
==== //depot/projects/drm-merge/sys/dev/drm/radeon_cp.c#4 (text+ko) ====
@@ -30,10 +30,10 @@
* $FreeBSD$
*/
-#include "drmP.h"
-#include "drm.h"
-#include "radeon_drm.h"
-#include "radeon_drv.h"
+#include "dev/drm/drmP.h"
+#include "dev/drm/drm.h"
+#include "dev/drm/radeon_drm.h"
+#include "dev/drm/radeon_drv.h"
#define RADEON_FIFO_DEBUG 0
==== //depot/projects/drm-merge/sys/dev/drm/radeon_drv.c#4 (text+ko) ====
@@ -29,11 +29,11 @@
* $FreeBSD$
*/
-#include "drmP.h"
-#include "drm.h"
-#include "radeon_drm.h"
-#include "radeon_drv.h"
-#include "drm_pciids.h"
+#include "dev/drm/drmP.h"
+#include "dev/drm/drm.h"
+#include "dev/drm/radeon_drm.h"
+#include "dev/drm/radeon_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 radeon_pciidlist[] = {
==== //depot/projects/drm-merge/sys/dev/drm/radeon_irq.c#4 (text+ko) ====
@@ -32,10 +32,10 @@
* $FreeBSD$
*/
-#include "drmP.h"
-#include "drm.h"
-#include "radeon_drm.h"
-#include "radeon_drv.h"
+#include "dev/drm/drmP.h"
+#include "dev/drm/drm.h"
+#include "dev/drm/radeon_drm.h"
+#include "dev/drm/radeon_drv.h"
/* Interrupts - Used for device synchronization and flushing in the
* following circumstances:
==== //depot/projects/drm-merge/sys/dev/drm/radeon_mem.c#4 (text+ko) ====
@@ -31,10 +31,10 @@
* $FreeBSD$
*/
-#include "drmP.h"
-#include "drm.h"
-#include "radeon_drm.h"
-#include "radeon_drv.h"
+#include "dev/drm/drmP.h"
+#include "dev/drm/drm.h"
+#include "dev/drm/radeon_drm.h"
+#include "dev/drm/radeon_drv.h"
/* Very simple allocator for GART memory, working on a static range
* already mapped into each client's address space.
==== //depot/projects/drm-merge/sys/dev/drm/radeon_state.c#4 (text+ko) ====
@@ -29,11 +29,11 @@
* $FreeBSD$
*/
-#include "drmP.h"
-#include "drm.h"
-#include "drm_sarea.h"
-#include "radeon_drm.h"
-#include "radeon_drv.h"
+#include "dev/drm/drmP.h"
+#include "dev/drm/drm.h"
+#include "dev/drm/drm_sarea.h"
+#include "dev/drm/radeon_drm.h"
+#include "dev/drm/radeon_drv.h"
/* ================================================================
* Helper functions for client state checking and fixup
==== //depot/projects/drm-merge/sys/dev/drm/sis_drv.c#4 (text+ko) ====
@@ -26,10 +26,10 @@
* $FreeBSD$
*/
-#include "drmP.h"
-#include "sis_drm.h"
-#include "sis_drv.h"
-#include "drm_pciids.h"
+#include "dev/drm/drmP.h"
+#include "dev/drm/sis_drm.h"
+#include "dev/drm/sis_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 sis_pciidlist[] = {
==== //depot/projects/drm-merge/sys/dev/drm/sis_drv.h#4 (text+ko) ====
@@ -40,7 +40,7 @@
#define DRIVER_MINOR 1
#define DRIVER_PATCHLEVEL 0
-#include "sis_ds.h"
+#include "dev/drm/sis_ds.h"
typedef struct drm_sis_private {
memHeap_t *AGPHeap;
==== //depot/projects/drm-merge/sys/dev/drm/sis_ds.c#4 (text+ko) ====
@@ -29,9 +29,9 @@
* $FreeBSD$
*/
-#include "drmP.h"
-#include "drm.h"
-#include "sis_ds.h"
+#include "dev/drm/drmP.h"
+#include "dev/drm/drm.h"
+#include "dev/drm/sis_ds.h"
/* Set Data Structure, not check repeated value
* temporarily used
==== //depot/projects/drm-merge/sys/dev/drm/sis_mm.c#4 (text+ko) ====
@@ -36,10 +36,10 @@
#include <linux/sisfb.h>
#endif
#endif
-#include "drmP.h"
-#include "sis_drm.h"
-#include "sis_drv.h"
-#include "sis_ds.h"
+#include "dev/drm/drmP.h"
+#include "dev/drm/sis_drm.h"
+#include "dev/drm/sis_drv.h"
+#include "dev/drm/sis_ds.h"
#define MAX_CONTEXT 100
#define VIDEO_TYPE 0
==== //depot/projects/drm-merge/sys/dev/drm/tdfx_drv.c#4 (text+ko) ====
@@ -32,9 +32,9 @@
* $FreeBSD$
*/
-#include "tdfx_drv.h"
-#include "drmP.h"
-#include "drm_pciids.h"
+#include "dev/drm/tdfx_drv.h"
+#include "dev/drm/drmP.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 tdfx_pciidlist[] = {
More information about the p4-projects
mailing list