aboutsummaryrefslogtreecommitdiff
path: root/sys/contrib/dev/acpica/components/executer/exoparg2.c
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2015-02-18 20:33:00 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2015-02-18 20:33:00 +0000
commit1c0e1b6da9c3c45f81c75137dddaebc748995afc (patch)
treefb0545399f40531160cc35b45423b4a49e6dbb79 /sys/contrib/dev/acpica/components/executer/exoparg2.c
parent784b6cd5e95df258eab273f2b4f29566d73525d5 (diff)
parente8991236d498c9646c20a8acf0236cf3342dad6f (diff)
downloadsrc-1c0e1b6da9c3c45f81c75137dddaebc748995afc.tar.gz
src-1c0e1b6da9c3c45f81c75137dddaebc748995afc.zip
Merge ACPICA 20141107 and 20150204.
Notes
Notes: svn path=/head/; revision=278970
Diffstat (limited to 'sys/contrib/dev/acpica/components/executer/exoparg2.c')
-rw-r--r--sys/contrib/dev/acpica/components/executer/exoparg2.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/contrib/dev/acpica/components/executer/exoparg2.c b/sys/contrib/dev/acpica/components/executer/exoparg2.c
index b11035596bc0..da1eb6c63700 100644
--- a/sys/contrib/dev/acpica/components/executer/exoparg2.c
+++ b/sys/contrib/dev/acpica/components/executer/exoparg2.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 __EXOPARG2_C__
-
#include <contrib/dev/acpica/include/acpi.h>
#include <contrib/dev/acpica/include/accommon.h>
#include <contrib/dev/acpica/include/acparser.h>