diff options
| author | msmith <msmith@FreeBSD.org> | 2000-12-21 07:04:32 +0000 |
|---|---|---|
| committer | msmith <msmith@FreeBSD.org> | 2000-12-21 07:04:32 +0000 |
| commit | 4b40c9999c4d400d6a2d421390b510397d71a4d9 (patch) | |
| tree | a3280f0c89b158e6e9b9e4776439ae0df1989211 /sys/contrib/dev/acpica/acgcc.h | |
| parent | 07e76fb2a28476ae54bb108098c0707743ab398c (diff) | |
| download | FreeBSD-src-4b40c9999c4d400d6a2d421390b510397d71a4d9.zip FreeBSD-src-4b40c9999c4d400d6a2d421390b510397d71a4d9.tar.gz | |
Resolve conflicts from the ACPI CA 20001215 vendor import.
Diffstat (limited to 'sys/contrib/dev/acpica/acgcc.h')
| -rw-r--r-- | sys/contrib/dev/acpica/acgcc.h | 6 |
1 files changed, 3 insertions, 3 deletions
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 * |
