From 4b40c9999c4d400d6a2d421390b510397d71a4d9 Mon Sep 17 00:00:00 2001
From: msmith <msmith@FreeBSD.org>
Date: Thu, 21 Dec 2000 07:04:32 +0000
Subject: Resolve conflicts from the ACPI CA 20001215 vendor import.

---
 sys/contrib/dev/acpica/acgcc.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'sys/contrib/dev/acpica/acgcc.h')

diff --git a/sys/contrib/dev/acpica/acgcc.h b/sys/contrib/dev/acpica/acgcc.h
index abbfa98..aa57a34 100644
--- a/sys/contrib/dev/acpica/acgcc.h
+++ b/sys/contrib/dev/acpica/acgcc.h
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acgcc.h - GCC specific defines, etc.
- *       $Revision: 2 $
+ *       $Revision: 3 $
  *
  *****************************************************************************/
 
@@ -9,8 +9,8 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999, Intel Corp.  All rights
- * reserved.
+ * Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
+ * All rights reserved.
  *
  * 2. License
  *
-- 
cgit v1.1