Use /*- to begin license blocks in BSD code to reduce diffs against FreeBSD

    CVS.

diff --git a/bsd-core/ati_pcigart.c b/bsd-core/ati_pcigart.c
index 4d8a03f..ae18a95 100644 (file)
--- a/bsd-core/ati_pcigart.c
+++ b/bsd-core/ati_pcigart.c
@@ -1,6 +1,7 @@
 /* ati_pcigart.h -- ATI PCI GART support -*- linux-c -*-
  * Created: Wed Dec 13 21:52:19 2000 by gareth@valinux.com
- *
+ */
+/*-
  * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.
  *

diff --git a/bsd-core/drmP.h b/bsd-core/drmP.h
index fbe1266..ca28ea2 100644 (file)
--- a/bsd-core/drmP.h
+++ b/bsd-core/drmP.h
@@ -1,6 +1,7 @@
 /* drmP.h -- Private header for Direct Rendering Manager -*- linux-c -*-
  * Created: Mon Jan  4 10:05:05 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/bsd-core/drm_agpsupport.c b/bsd-core/drm_agpsupport.c
index ff890e2..6d58134 100644 (file)
--- a/bsd-core/drm_agpsupport.c
+++ b/bsd-core/drm_agpsupport.c
@@ -1,6 +1,7 @@
 /* drm_agpsupport.h -- DRM support for AGP/GART backend -*- linux-c -*-
  * Created: Mon Dec 13 09:56:45 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/bsd-core/drm_atomic.h b/bsd-core/drm_atomic.h
index 26e7d45..b499fc9 100644 (file)
--- a/bsd-core/drm_atomic.h
+++ b/bsd-core/drm_atomic.h
@@ -5,7 +5,7 @@
  * \author Eric Anholt <anholt@FreeBSD.org>
  */
 
-/*
+/*-
  * Copyright 2004 Eric Anholt
  * All Rights Reserved.
  *

diff --git a/bsd-core/drm_auth.c b/bsd-core/drm_auth.c
index dfd820d..aa0e29c 100644 (file)
--- a/bsd-core/drm_auth.c
+++ b/bsd-core/drm_auth.c
@@ -1,6 +1,7 @@
 /* drm_auth.h -- IOCTLs for authentication -*- linux-c -*-
  * Created: Tue Feb  2 08:37:54 1999 by faith@valinux.com
- *
+ */
+/*-
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
  * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.

diff --git a/bsd-core/drm_bufs.c b/bsd-core/drm_bufs.c
index 135cada..a5651d0 100644 (file)
--- a/bsd-core/drm_bufs.c
+++ b/bsd-core/drm_bufs.c
@@ -1,6 +1,7 @@
 /* drm_bufs.h -- Generic buffer template -*- linux-c -*-
  * Created: Thu Nov 23 03:10:50 2000 by gareth@valinux.com
- *
+ */
+/*-
  * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
  * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.

diff --git a/bsd-core/drm_context.c b/bsd-core/drm_context.c
index 368bdfb..11e8781 100644 (file)
--- a/bsd-core/drm_context.c
+++ b/bsd-core/drm_context.c
@@ -1,6 +1,7 @@
 /* drm_context.h -- IOCTLs for generic contexts -*- linux-c -*-
  * Created: Fri Nov 24 18:31:37 2000 by gareth@valinux.com
- *
+ */
+/*-
  * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
  * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.

diff --git a/bsd-core/drm_dma.c b/bsd-core/drm_dma.c
index f421eb8..adc352b 100644 (file)
--- a/bsd-core/drm_dma.c
+++ b/bsd-core/drm_dma.c
@@ -1,6 +1,7 @@
 /* drm_dma.c -- DMA IOCTL and function support -*- linux-c -*-
  * Created: Fri Mar 19 14:30:16 1999 by faith@valinux.com
- *
+ */
+/*-
  * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
  * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.

diff --git a/bsd-core/drm_drawable.c b/bsd-core/drm_drawable.c
index 43a9104..379e0aa 100644 (file)
--- a/bsd-core/drm_drawable.c
+++ b/bsd-core/drm_drawable.c
@@ -1,6 +1,7 @@
 /* drm_drawable.h -- IOCTLs for drawables -*- linux-c -*-
  * Created: Tue Feb  2 08:37:54 1999 by faith@valinux.com
- *
+ */
+/*-
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
  * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.

diff --git a/bsd-core/drm_drv.c b/bsd-core/drm_drv.c
index fe5e56e..71fcb7c 100644 (file)
--- a/bsd-core/drm_drv.c
+++ b/bsd-core/drm_drv.c
@@ -1,6 +1,7 @@
 /* drm_drv.h -- Generic driver template -*- linux-c -*-
  * Created: Thu Nov 23 03:10:50 2000 by gareth@valinux.com
- *
+ */
+/*-
  * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
  * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.

diff --git a/bsd-core/drm_fops.c b/bsd-core/drm_fops.c
index 44c2b8d..18c08e1 100644 (file)
--- a/bsd-core/drm_fops.c
+++ b/bsd-core/drm_fops.c
@@ -1,6 +1,7 @@
 /* drm_fops.h -- File operations for DRM -*- linux-c -*-
  * Created: Mon Jan  4 08:58:31 1999 by faith@valinux.com
- *
+ */
+/*-
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
  * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.

diff --git a/bsd-core/drm_ioctl.c b/bsd-core/drm_ioctl.c
index 62f4221..9079e69 100644 (file)
--- a/bsd-core/drm_ioctl.c
+++ b/bsd-core/drm_ioctl.c
@@ -1,6 +1,7 @@
 /* drm_ioctl.h -- IOCTL processing for DRM -*- linux-c -*-
  * Created: Fri Jan  8 09:01:26 1999 by faith@valinux.com
- *
+ */
+/*-
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
  * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.

diff --git a/bsd-core/drm_irq.c b/bsd-core/drm_irq.c
index f2c39fd..d0434c4 100644 (file)
--- a/bsd-core/drm_irq.c
+++ b/bsd-core/drm_irq.c
@@ -1,6 +1,7 @@
 /* drm_dma.c -- DMA IOCTL and function support
  * Created: Fri Oct 18 2003 by anholt@FreeBSD.org
- *
+ */
+/*-
  * Copyright 2003 Eric Anholt
  * All Rights Reserved.
  *

diff --git a/bsd-core/drm_linux_list.h b/bsd-core/drm_linux_list.h
index e4f9f0c..c9f1b3e 100644 (file)
--- a/bsd-core/drm_linux_list.h
+++ b/bsd-core/drm_linux_list.h
@@ -1,6 +1,7 @@
 /* drm_linux_list.h -- linux list functions for the BSDs.
  * Created: Mon Apr 7 14:30:16 1999 by anholt@FreeBSD.org
- *
+ */
+/*-
  * Copyright 2003 Eric Anholt
  * All Rights Reserved.
  *
@@ -25,6 +26,7 @@
  *
  * Authors:
  *    Eric Anholt <anholt@FreeBSD.org>
+ *
  */
 
 struct list_head {

diff --git a/bsd-core/drm_lock.c b/bsd-core/drm_lock.c
index af6f6a7..1b2beaa 100644 (file)
--- a/bsd-core/drm_lock.c
+++ b/bsd-core/drm_lock.c
@@ -1,6 +1,7 @@
 /* lock.c -- IOCTLs for locking -*- linux-c -*-
  * Created: Tue Feb  2 08:37:54 1999 by faith@valinux.com
- *
+ */
+/*-
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
  * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.

diff --git a/bsd-core/drm_memory.c b/bsd-core/drm_memory.c
index 497cd83..ea084c5 100644 (file)
--- a/bsd-core/drm_memory.c
+++ b/bsd-core/drm_memory.c
@@ -1,7 +1,8 @@
 /* drm_memory.h -- Memory management wrappers for DRM -*- linux-c -*-
  * Created: Thu Feb  4 14:00:34 1999 by faith@valinux.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/bsd-core/drm_pci.c b/bsd-core/drm_pci.c
index 4c8941d..29ed479 100644 (file)
--- a/bsd-core/drm_pci.c
+++ b/bsd-core/drm_pci.c
@@ -5,7 +5,7 @@
  * \author Eric Anholt <anholt@FreeBSD.org>
  */
 
-/*
+/*-
  * Copyright 2003 Eric Anholt.
  * All Rights Reserved.
  *

diff --git a/bsd-core/drm_scatter.c b/bsd-core/drm_scatter.c
index 7a035af..107905a 100644 (file)
--- a/bsd-core/drm_scatter.c
+++ b/bsd-core/drm_scatter.c
@@ -1,6 +1,6 @@
 /* drm_scatter.h -- IOCTLs to manage scatter/gather memory -*- linux-c -*-
- * Created: Mon Dec 18 23:20:54 2000 by gareth@valinux.com
- *
+ * Created: Mon Dec 18 23:20:54 2000 by gareth@valinux.com */
+/*-
  * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.
  *

diff --git a/bsd-core/drm_sysctl.c b/bsd-core/drm_sysctl.c
index dd45371..aa6bee4 100644 (file)
--- a/bsd-core/drm_sysctl.c
+++ b/bsd-core/drm_sysctl.c
@@ -1,4 +1,4 @@
-/* 
+/*-
  * Copyright 2003 Eric Anholt
  * All Rights Reserved.
  *

diff --git a/bsd-core/drm_vm.c b/bsd-core/drm_vm.c
index 3770a69..419b3cb 100644 (file)
--- a/bsd-core/drm_vm.c
+++ b/bsd-core/drm_vm.c
@@ -1,4 +1,4 @@
-/* 
+/*-
  * Copyright 2003 Eric Anholt
  * All Rights Reserved.
  *

diff --git a/bsd-core/i915_drv.c b/bsd-core/i915_drv.c
index 9729f05..bb674fa 100644 (file)
--- a/bsd-core/i915_drv.c
+++ b/bsd-core/i915_drv.c
@@ -1,6 +1,7 @@
 /* i915_drv.c -- ATI Radeon driver -*- linux-c -*-
  * Created: Wed Feb 14 17:10:04 2001 by gareth@valinux.com
- *
+ */
+/*-
  * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.
  *

diff --git a/bsd-core/mach64_drv.c b/bsd-core/mach64_drv.c
index 32e2ec6..a123579 100644 (file)
--- a/bsd-core/mach64_drv.c
+++ b/bsd-core/mach64_drv.c
@@ -1,6 +1,7 @@
 /* mach64_drv.c -- ATI Rage 128 driver -*- linux-c -*-
  * Created: Mon Dec 13 09:47:27 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/bsd-core/mga_drv.c b/bsd-core/mga_drv.c
index 5d148a9..bff8c42 100644 (file)
--- a/bsd-core/mga_drv.c
+++ b/bsd-core/mga_drv.c
@@ -1,6 +1,7 @@
 /* mga_drv.c -- Matrox G200/G400 driver -*- linux-c -*-
  * Created: Mon Dec 13 01:56:22 1999 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/bsd-core/r128_drv.c b/bsd-core/r128_drv.c
index f101279..37a3324 100644 (file)
--- a/bsd-core/r128_drv.c
+++ b/bsd-core/r128_drv.c
@@ -1,6 +1,7 @@
 /* r128_drv.c -- ATI Rage 128 driver -*- linux-c -*-
  * Created: Mon Dec 13 09:47:27 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/bsd-core/radeon_drv.c b/bsd-core/radeon_drv.c
index bac6205..29f54cd 100644 (file)
--- a/bsd-core/radeon_drv.c
+++ b/bsd-core/radeon_drv.c
@@ -1,6 +1,7 @@
 /* radeon_drv.c -- ATI Radeon driver -*- linux-c -*-
  * Created: Wed Feb 14 17:10:04 2001 by gareth@valinux.com
- *
+ */
+/*-
  * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.
  *

diff --git a/bsd-core/savage_drv.c b/bsd-core/savage_drv.c
index 2ebcede..a75a69f 100644 (file)
--- a/bsd-core/savage_drv.c
+++ b/bsd-core/savage_drv.c
@@ -1,5 +1,6 @@
 /* savage_drv.c -- Savage DRI driver
- *
+ */
+/*-
  * Copyright 2005 Eric Anholt
  * All Rights Reserved.
  *

diff --git a/bsd-core/sis_drv.c b/bsd-core/sis_drv.c
index 10eca39..985dc4b 100644 (file)
--- a/bsd-core/sis_drv.c
+++ b/bsd-core/sis_drv.c
@@ -1,5 +1,6 @@
 /* sis.c -- 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/bsd-core/tdfx_drv.c b/bsd-core/tdfx_drv.c
index 434fc42..036d8ec 100644 (file)
--- a/bsd-core/tdfx_drv.c
+++ b/bsd-core/tdfx_drv.c
@@ -1,6 +1,7 @@
 /* tdfx_drv.c -- tdfx driver -*- linux-c -*-
  * Created: Thu Oct  7 10:38:32 1999 by faith@precisioninsight.com
- *
+ */
+/*-
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
  * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.