diff options
author | Jung-uk Kim <jkim@FreeBSD.org> | 2015-02-18 20:33:00 +0000 |
---|---|---|
committer | Jung-uk Kim <jkim@FreeBSD.org> | 2015-02-18 20:33:00 +0000 |
commit | 1c0e1b6da9c3c45f81c75137dddaebc748995afc (patch) | |
tree | fb0545399f40531160cc35b45423b4a49e6dbb79 /sys/contrib/dev/acpica/components/utilities/utdecode.c | |
parent | 784b6cd5e95df258eab273f2b4f29566d73525d5 (diff) | |
parent | e8991236d498c9646c20a8acf0236cf3342dad6f (diff) |
Merge ACPICA 20141107 and 20150204.
Notes
Notes:
svn path=/head/; revision=278970
Diffstat (limited to 'sys/contrib/dev/acpica/components/utilities/utdecode.c')
-rw-r--r-- | sys/contrib/dev/acpica/components/utilities/utdecode.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/contrib/dev/acpica/components/utilities/utdecode.c b/sys/contrib/dev/acpica/components/utilities/utdecode.c index 9fd52077cd61..c1887ee2269e 100644 --- a/sys/contrib/dev/acpica/components/utilities/utdecode.c +++ b/sys/contrib/dev/acpica/components/utilities/utdecode.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2014, Intel Corp. + * Copyright (C) 2000 - 2015, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -41,8 +41,6 @@ * POSSIBILITY OF SUCH DAMAGES. */ -#define __UTDECODE_C__ - #include <contrib/dev/acpica/include/acpi.h> #include <contrib/dev/acpica/include/accommon.h> #include <contrib/dev/acpica/include/acnamesp.h> |