diff options
| -rw-r--r-- | shared-core/i915_dma.c | 5 | ||||
| -rw-r--r-- | shared-core/i915_drm.h | 5 | ||||
| -rw-r--r-- | shared-core/i915_drv.h | 4 | ||||
| -rw-r--r-- | shared-core/i915_irq.c | 5 | ||||
| -rw-r--r-- | shared-core/i915_mem.c | 5 | ||||
| -rw-r--r-- | shared-core/mach64_drm.h | 3 | ||||
| -rw-r--r-- | shared-core/mach64_drv.h | 3 | ||||
| -rw-r--r-- | shared-core/mach64_irq.c | 3 | ||||
| -rw-r--r-- | shared-core/mach64_state.c | 3 | ||||
| -rw-r--r-- | shared-core/mga_dma.c | 4 | ||||
| -rw-r--r-- | shared-core/mga_irq.c | 3 | ||||
| -rw-r--r-- | shared-core/mga_state.c | 3 | ||||
| -rw-r--r-- | shared-core/mga_warp.c | 3 | ||||
| -rw-r--r-- | shared-core/r128_cce.c | 3 | ||||
| -rw-r--r-- | shared-core/r128_drm.h | 3 | ||||
| -rw-r--r-- | shared-core/r128_drv.h | 3 | ||||
| -rw-r--r-- | shared-core/r128_irq.c | 3 | ||||
| -rw-r--r-- | shared-core/r128_state.c | 3 | ||||
| -rw-r--r-- | shared-core/radeon_cp.c | 4 | ||||
| -rw-r--r-- | shared-core/radeon_irq.c | 4 | ||||
| -rw-r--r-- | shared-core/radeon_mem.c | 4 | ||||
| -rw-r--r-- | shared-core/radeon_state.c | 4 | ||||
| -rw-r--r-- | shared-core/savage_drv.h | 4 | ||||
| -rw-r--r-- | shared-core/sis_drm.h | 25 | ||||
| -rw-r--r-- | shared-core/sis_drv.h | 4 | ||||
| -rw-r--r-- | shared-core/sis_ds.h | 3 | ||||
| -rw-r--r-- | shared-core/tdfx_drv.h | 3 |
27 files changed, 77 insertions, 42 deletions
diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c index 4b29d2c0..ee8dbcd7 100644 --- a/shared-core/i915_dma.c +++ b/shared-core/i915_dma.c @@ -1,7 +1,6 @@ /* i915_dma.c -- DMA support for the I915 -*- linux-c -*- */ -/************************************************************************** - * +/* * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas. * All Rights Reserved. * @@ -25,7 +24,7 @@ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * - **************************************************************************/ + */ #include "drmP.h" #include "drm.h" diff --git a/shared-core/i915_drm.h b/shared-core/i915_drm.h index 47a9e321..42d726c5 100644 --- a/shared-core/i915_drm.h +++ b/shared-core/i915_drm.h @@ -1,5 +1,4 @@ -/************************************************************************** - * +/* * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas. * All Rights Reserved. * @@ -23,7 +22,7 @@ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * - **************************************************************************/ + */ #ifndef _I915_DRM_H_ #define _I915_DRM_H_ diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h index 7bd13219..7107d45c 100644 --- a/shared-core/i915_drv.h +++ b/shared-core/i915_drv.h @@ -1,6 +1,6 @@ /* i915_drv.h -- Private header for the I915 driver -*- linux-c -*- */ -/************************************************************************** +/* * * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas. * All Rights Reserved. @@ -25,7 +25,7 @@ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * - **************************************************************************/ + */ #ifndef _I915_DRV_H_ #define _I915_DRV_H_ diff --git a/shared-core/i915_irq.c b/shared-core/i915_irq.c index 1b7b2a38..2ec75f51 100644 --- a/shared-core/i915_irq.c +++ b/shared-core/i915_irq.c @@ -1,7 +1,6 @@ /* i915_irq.c -- IRQ support for the I915 -*- linux-c -*- */ -/************************************************************************** - * +/* * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas. * All Rights Reserved. * @@ -25,7 +24,7 @@ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * - **************************************************************************/ + */ #include "drmP.h" #include "drm.h" diff --git a/shared-core/i915_mem.c b/shared-core/i915_mem.c index 13176d13..ba87ff17 100644 --- a/shared-core/i915_mem.c +++ b/shared-core/i915_mem.c @@ -1,7 +1,6 @@ /* i915_mem.c -- Simple agp/fb memory manager for i915 -*- linux-c -*- */ -/************************************************************************** - * +/* * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas. * All Rights Reserved. * @@ -25,7 +24,7 @@ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * - **************************************************************************/ + */ #include "drmP.h" #include "drm.h" diff --git a/shared-core/mach64_drm.h b/shared-core/mach64_drm.h index 3cf8da64..d92ece2c 100644 --- a/shared-core/mach64_drm.h +++ b/shared-core/mach64_drm.h @@ -1,6 +1,7 @@ /* mach64_drm.h -- Public header for the mach64 driver -*- linux-c -*- * Created: Thu Nov 30 20:04:32 2000 by gareth@valinux.com - * + */ +/* * Copyright 2000 Gareth Hughes * Copyright 2002 Frank C. Earl * Copyright 2002-2003 Leif Delgass diff --git a/shared-core/mach64_drv.h b/shared-core/mach64_drv.h index e22827f4..2a5f2ff9 100644 --- a/shared-core/mach64_drv.h +++ b/shared-core/mach64_drv.h @@ -1,6 +1,7 @@ /* mach64_drv.h -- Private header for mach64 driver -*- linux-c -*- * Created: Fri Nov 24 22:07:58 2000 by gareth@valinux.com - * + */ +/* * Copyright 2000 Gareth Hughes * Copyright 2002 Frank C. Earl * Copyright 2002-2003 Leif Delgass diff --git a/shared-core/mach64_irq.c b/shared-core/mach64_irq.c index b8853c1c..663642db 100644 --- a/shared-core/mach64_irq.c +++ b/shared-core/mach64_irq.c @@ -1,6 +1,7 @@ /* mach64_irq.c -- IRQ handling for ATI Mach64 -*- linux-c -*- * Created: Tue Feb 25, 2003 by Leif Delgass, based on radeon_irq.c/r128_irq.c - * + */ +/*- * Copyright (C) The Weather Channel, Inc. 2002. * Copyright 2003 Leif Delgass * All Rights Reserved. diff --git a/shared-core/mach64_state.c b/shared-core/mach64_state.c index 964d4c58..ce44f0d5 100644 --- a/shared-core/mach64_state.c +++ b/shared-core/mach64_state.c @@ -1,6 +1,7 @@ /* mach64_state.c -- State support for mach64 (Rage Pro) driver -*- linux-c -*- * Created: Sun Dec 03 19:20:26 2000 by gareth@valinux.com - * + */ +/* * Copyright 2000 Gareth Hughes * Copyright 2002-2003 Leif Delgass * All Rights Reserved. diff --git a/shared-core/mga_dma.c b/shared-core/mga_dma.c index cc93d5ae..e6468d67 100644 --- a/shared-core/mga_dma.c +++ b/shared-core/mga_dma.c @@ -1,7 +1,7 @@ /* mga_dma.c -- DMA support for mga g200/g400 -*- linux-c -*- * Created: Mon Dec 13 01:50:01 1999 by jhartmann@precisioninsight.com - * - * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. + */ +/* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. * All Rights Reserved. * diff --git a/shared-core/mga_irq.c b/shared-core/mga_irq.c index 16dfd44b..490d1fbb 100644 --- a/shared-core/mga_irq.c +++ b/shared-core/mga_irq.c @@ -1,5 +1,6 @@ /* mga_irq.c -- IRQ handling for radeon -*- linux-c -*- - * + */ +/* * Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved. * * The Weather Channel (TM) funded Tungsten Graphics to develop the diff --git a/shared-core/mga_state.c b/shared-core/mga_state.c index 1f7c679a..8e5cb334 100644 --- a/shared-core/mga_state.c +++ b/shared-core/mga_state.c @@ -1,6 +1,7 @@ /* mga_state.c -- State support for MGA G200/G400 -*- linux-c -*- * Created: Thu Jan 27 02:53:43 2000 by jhartmann@precisioninsight.com - * + */ +/* * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. * All Rights Reserved. diff --git a/shared-core/mga_warp.c b/shared-core/mga_warp.c index fabfe6f0..05ed8058 100644 --- a/shared-core/mga_warp.c +++ b/shared-core/mga_warp.c @@ -1,6 +1,7 @@ /* mga_warp.c -- Matrox G200/G400 WARP engine management -*- linux-c -*- * Created: Thu Jan 11 21:29:32 2001 by gareth@valinux.com - * + */ +/* * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. * All Rights Reserved. * diff --git a/shared-core/r128_cce.c b/shared-core/r128_cce.c index 06880e0b..f9a9eb32 100644 --- a/shared-core/r128_cce.c +++ b/shared-core/r128_cce.c @@ -1,6 +1,7 @@ /* r128_cce.c -- ATI Rage 128 driver -*- linux-c -*- * Created: Wed Apr 5 19:24:19 2000 by kevin@precisioninsight.com - * + */ +/* * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas. * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. * All Rights Reserved. diff --git a/shared-core/r128_drm.h b/shared-core/r128_drm.h index 5ddc0320..6e8af313 100644 --- a/shared-core/r128_drm.h +++ b/shared-core/r128_drm.h @@ -1,6 +1,7 @@ /* r128_drm.h -- Public header for the r128 driver -*- linux-c -*- * Created: Wed Apr 5 19:24:19 2000 by kevin@precisioninsight.com - * + */ +/* * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas. * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. * All rights reserved. diff --git a/shared-core/r128_drv.h b/shared-core/r128_drv.h index 9a779bad..f1efb49d 100644 --- a/shared-core/r128_drv.h +++ b/shared-core/r128_drv.h @@ -1,6 +1,7 @@ /* r128_drv.h -- Private header for r128 driver -*- linux-c -*- * Created: Mon Dec 13 09:51:11 1999 by faith@precisioninsight.com - * + */ +/* * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. * All rights reserved. diff --git a/shared-core/r128_irq.c b/shared-core/r128_irq.c index 27eb0e31..de1597ec 100644 --- a/shared-core/r128_irq.c +++ b/shared-core/r128_irq.c @@ -1,5 +1,6 @@ /* r128_irq.c -- IRQ handling for radeon -*- linux-c -*- - * + */ +/* * Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved. * * The Weather Channel (TM) funded Tungsten Graphics to develop the diff --git a/shared-core/r128_state.c b/shared-core/r128_state.c index 6aeeb4b6..deeb67ed 100644 --- a/shared-core/r128_state.c +++ b/shared-core/r128_state.c @@ -1,6 +1,7 @@ /* r128_state.c -- State support for r128 -*- linux-c -*- * Created: Thu Jan 27 02:53:43 2000 by gareth@valinux.com - * + */ +/* * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. * All Rights Reserved. * diff --git a/shared-core/radeon_cp.c b/shared-core/radeon_cp.c index 30f63731..06868848 100644 --- a/shared-core/radeon_cp.c +++ b/shared-core/radeon_cp.c @@ -1,5 +1,5 @@ -/* radeon_cp.c -- CP support for Radeon -*- linux-c -*- - * +/* radeon_cp.c -- CP support for Radeon -*- linux-c -*- */ +/* * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas. * Copyright 2000 VA Linux Systems, Inc., Fremont, California. * All Rights Reserved. diff --git a/shared-core/radeon_irq.c b/shared-core/radeon_irq.c index d60519de..3ff0baa2 100644 --- a/shared-core/radeon_irq.c +++ b/shared-core/radeon_irq.c @@ -1,5 +1,5 @@ -/* radeon_irq.c -- IRQ handling for radeon -*- linux-c -*- - * +/* radeon_irq.c -- IRQ handling for radeon -*- linux-c -*- */ +/* * Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved. * * The Weather Channel (TM) funded Tungsten Graphics to develop the diff --git a/shared-core/radeon_mem.c b/shared-core/radeon_mem.c index 01048a5a..dbc91c9f 100644 --- a/shared-core/radeon_mem.c +++ b/shared-core/radeon_mem.c @@ -1,5 +1,5 @@ -/* radeon_mem.c -- Simple GART/fb memory manager for radeon -*- linux-c -*- - * +/* radeon_mem.c -- Simple GART/fb memory manager for radeon -*- linux-c -*- */ +/* * Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved. * * The Weather Channel (TM) funded Tungsten Graphics to develop the diff --git a/shared-core/radeon_state.c b/shared-core/radeon_state.c index 2b5f7108..670f6172 100644 --- a/shared-core/radeon_state.c +++ b/shared-core/radeon_state.c @@ -1,5 +1,5 @@ -/* radeon_state.c -- State support for Radeon -*- linux-c -*- - * +/* radeon_state.c -- State support for Radeon -*- linux-c -*- */ +/* * Copyright 2000 VA Linux Systems, Inc., Fremont, California. * All Rights Reserved. * diff --git a/shared-core/savage_drv.h b/shared-core/savage_drv.h index 01abb58d..560f934e 100644 --- a/shared-core/savage_drv.h +++ b/shared-core/savage_drv.h @@ -1,5 +1,5 @@ -/* savage_drv.h -- Private header for the savage driver - * +/* savage_drv.h -- Private header for the savage driver */ +/* * Copyright 2004 Felix Kuehling * All Rights Reserved. * diff --git a/shared-core/sis_drm.h b/shared-core/sis_drm.h index 8f273da7..30f7b382 100644 --- a/shared-core/sis_drm.h +++ b/shared-core/sis_drm.h @@ -1,3 +1,28 @@ +/* sis_drv.h -- Private header for sis driver -*- linux-c -*- */ +/* + * Copyright 2005 Eric Anholt + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + */ #ifndef __SIS_DRM_H__ #define __SIS_DRM_H__ diff --git a/shared-core/sis_drv.h b/shared-core/sis_drv.h index b1fddad8..e218e526 100644 --- a/shared-core/sis_drv.h +++ b/shared-core/sis_drv.h @@ -1,5 +1,5 @@ -/* sis_drv.h -- Private header for sis driver -*- linux-c -*- - * +/* sis_drv.h -- Private header for sis driver -*- linux-c -*- */ +/* * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. * All rights reserved. diff --git a/shared-core/sis_ds.h b/shared-core/sis_ds.h index 5abfeeaf..0b70d7a8 100644 --- a/shared-core/sis_ds.h +++ b/shared-core/sis_ds.h @@ -1,6 +1,7 @@ /* sis_ds.h -- Private header for Direct Rendering Manager -*- linux-c -*- * Created: Mon Jan 4 10:05:05 1999 by sclin@sis.com.tw - * + */ +/* * Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan. * All rights reserved. * diff --git a/shared-core/tdfx_drv.h b/shared-core/tdfx_drv.h index 857be434..84204ec1 100644 --- a/shared-core/tdfx_drv.h +++ b/shared-core/tdfx_drv.h @@ -1,6 +1,7 @@ /* tdfx.h -- 3dfx DRM template customization -*- linux-c -*- * Created: Wed Feb 14 12:32:32 2001 by gareth@valinux.com - * + */ +/* * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. * All Rights Reserved. * |