From 3d3f4787479ec4e8494cd90fa8165b3c60487f27 Mon Sep 17 00:00:00 2001
From: Lin Ming <ming.m.lin@intel.com>
Date: Wed, 24 Jun 2009 11:25:17 +0800
Subject: [PATCH] --- yaml --- r: 165191 b: refs/heads/master c:
 3db20bed579bc4e7fe581c48ad1bde853aa9ff68 h: refs/heads/master i:   165189:
 66e406ab419e98a6454463c0b29d70c3c28af714   165187:
 9170a59cead7f919e47c4d6f4d93f33d89cd9025   165183:
 bf14682697bf2516addf7df6d5e659997288fb90 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/acpi/acpica/acconfig.h | 2 +-
 trunk/drivers/acpi/acpica/amlcode.h  | 1 +
 trunk/drivers/acpi/acpica/utglobal.c | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ad30cc69b82a..047861d7dd68 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dbdc8f02fe8339686623c84745ba15b0f4f889a1
+refs/heads/master: 3db20bed579bc4e7fe581c48ad1bde853aa9ff68
diff --git a/trunk/drivers/acpi/acpica/acconfig.h b/trunk/drivers/acpi/acpica/acconfig.h
index 6c1fb2d9f4d5..9123d5a11627 100644
--- a/trunk/drivers/acpi/acpica/acconfig.h
+++ b/trunk/drivers/acpi/acpica/acconfig.h
@@ -183,7 +183,7 @@
 
 /* Operation regions */
 
-#define ACPI_NUM_PREDEFINED_REGIONS     8
+#define ACPI_NUM_PREDEFINED_REGIONS     9
 #define ACPI_USER_REGION_BEGIN          0x80
 
 /* Maximum space_ids for Operation Regions */
diff --git a/trunk/drivers/acpi/acpica/amlcode.h b/trunk/drivers/acpi/acpica/amlcode.h
index 067f967eb389..4940249f2524 100644
--- a/trunk/drivers/acpi/acpica/amlcode.h
+++ b/trunk/drivers/acpi/acpica/amlcode.h
@@ -404,6 +404,7 @@ typedef enum {
 	REGION_SMBUS,
 	REGION_CMOS,
 	REGION_PCI_BAR,
+	REGION_IPMI,
 	REGION_DATA_TABLE,	/* Internal use only */
 	REGION_FIXED_HW = 0x7F
 } AML_REGION_TYPES;
diff --git a/trunk/drivers/acpi/acpica/utglobal.c b/trunk/drivers/acpi/acpica/utglobal.c
index ed7a33c67fbe..9e33b6261939 100644
--- a/trunk/drivers/acpi/acpica/utglobal.c
+++ b/trunk/drivers/acpi/acpica/utglobal.c
@@ -359,6 +359,7 @@ const char *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS] = {
 	"SMBus",
 	"SystemCMOS",
 	"PCIBARTarget",
+	"IPMI",
 	"DataTable"
 };