From 445de329250caa20c2a46ccb80bfe2f9203a9c08 Mon Sep 17 00:00:00 2001 From: Bob Moore Date: Wed, 13 Apr 2011 13:20:49 +0800 Subject: [PATCH] --- yaml --- r: 252765 b: refs/heads/master c: 07aa99e9df2184e78068f7d5414e29e4a5a1b452 h: refs/heads/master i: 252763: 7073f28212d4e2a34b7cabeb63f97b92cd766283 v: v3 --- [refs] | 2 +- trunk/drivers/acpi/acpica/acconfig.h | 1 - trunk/include/acpi/actypes.h | 4 +++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 26d0b5dc2af0..1541b2ff0ec3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 82a1b7cb83b6bd7d2fe3972e847c8ccbff55cb9c +refs/heads/master: 07aa99e9df2184e78068f7d5414e29e4a5a1b452 diff --git a/trunk/drivers/acpi/acpica/acconfig.h b/trunk/drivers/acpi/acpica/acconfig.h index c115bb9bd4d3..bc533dde16c4 100644 --- a/trunk/drivers/acpi/acpica/acconfig.h +++ b/trunk/drivers/acpi/acpica/acconfig.h @@ -187,7 +187,6 @@ /* Operation regions */ -#define ACPI_NUM_PREDEFINED_REGIONS 8 #define ACPI_USER_REGION_BEGIN 0x80 /* Maximum space_ids for Operation Regions */ diff --git a/trunk/include/acpi/actypes.h b/trunk/include/acpi/actypes.h index ad77c613c743..f3b29fa5654e 100644 --- a/trunk/include/acpi/actypes.h +++ b/trunk/include/acpi/actypes.h @@ -713,8 +713,10 @@ typedef u8 acpi_adr_space_type; #define ACPI_ADR_SPACE_PCI_BAR_TARGET (acpi_adr_space_type) 6 #define ACPI_ADR_SPACE_IPMI (acpi_adr_space_type) 7 +#define ACPI_NUM_PREDEFINED_REGIONS 8 + /* - * Special region types + * Special Address Spaces * * Note: A Data Table region is a special type of operation region * that has its own AML opcode. However, internally, the AML