summaryrefslogtreecommitdiffstats
path: root/sys/contrib/dev/acpica/acgcc.h
diff options
context:
space:
mode:
authormsmith <msmith@FreeBSD.org>2001-01-31 09:44:45 +0000
committermsmith <msmith@FreeBSD.org>2001-01-31 09:44:45 +0000
commit55303e9ac4cd5903cc13c55f79f35df11d4e693e (patch)
tree2442a151009665a2cb3e6ae5ecaf54907441858a /sys/contrib/dev/acpica/acgcc.h
parent86f58a13be65c96be3af84bf3ad0fdbe4f13f8e1 (diff)
downloadFreeBSD-src-55303e9ac4cd5903cc13c55f79f35df11d4e693e.zip
FreeBSD-src-55303e9ac4cd5903cc13c55f79f35df11d4e693e.tar.gz
Merge conflicts from the ACPI CA 20010125 import.
Diffstat (limited to 'sys/contrib/dev/acpica/acgcc.h')
-rw-r--r--sys/contrib/dev/acpica/acgcc.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/contrib/dev/acpica/acgcc.h b/sys/contrib/dev/acpica/acgcc.h
index aa57a34..f4510e7 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: 3 $
+ * $Revision: 4 $
*
*****************************************************************************/
@@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999, 2000, 2001, Intel Corp.
* All rights reserved.
*
* 2. License
OpenPOWER on IntegriCloud