diff options
author | iwasaki <iwasaki@FreeBSD.org> | 2002-11-27 18:09:20 +0000 |
---|---|---|
committer | iwasaki <iwasaki@FreeBSD.org> | 2002-11-27 18:09:20 +0000 |
commit | 05cb8cd7b7d41fa96a64a0f8b120806eb4fb0933 (patch) | |
tree | 4bace62f2c1b2923ceef90efb5b5547a7086ee61 /sys/contrib/dev/acpica/acconfig.h | |
parent | 10fb1b40ac2c40a3ce01db48e82a02380186cda2 (diff) | |
download | FreeBSD-src-05cb8cd7b7d41fa96a64a0f8b120806eb4fb0933.zip FreeBSD-src-05cb8cd7b7d41fa96a64a0f8b120806eb4fb0933.tar.gz |
Resolve conflicts arising from the ACPI CA 20021118 import.
Diffstat (limited to 'sys/contrib/dev/acpica/acconfig.h')
-rw-r--r-- | sys/contrib/dev/acpica/acconfig.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/contrib/dev/acpica/acconfig.h b/sys/contrib/dev/acpica/acconfig.h index b746bc1..ce7d3cd 100644 --- a/sys/contrib/dev/acpica/acconfig.h +++ b/sys/contrib/dev/acpica/acconfig.h @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acconfig.h - Global configuration constants - * $Revision: 112 $ + * $Revision: 118 $ * *****************************************************************************/ @@ -145,7 +145,7 @@ /* Version string */ -#define ACPI_CA_VERSION 0x20021002 +#define ACPI_CA_VERSION 0x20021115 /* Version of ACPI supported */ @@ -257,6 +257,10 @@ #define ACPI_RSDP_CHECKSUM_LENGTH 20 #define ACPI_RSDP_XCHECKSUM_LENGTH 36 +/* SMBus bidirectional buffer size */ + +#define ACPI_SMBUS_BUFFER_SIZE 34 + /****************************************************************************** * |