Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mv-sheeva.git] / drivers / acpi / acpica / utglobal.c

diff --git a/drivers/acpi/acpica/utglobal.c b/drivers/acpi/acpica/utglobal.c
index ed7a33c67fbe755ce8cd22ec09ac19ad6d0206d9..3f2c68f4e9598a58df4896c9bb0ea128fb46bbec 100644 (file)
--- a/drivers/acpi/acpica/utglobal.c
+++ b/drivers/acpi/acpica/utglobal.c
@@ -359,6 +359,7 @@ const char *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS] = {
        "SMBus",
        "SystemCMOS",
        "PCIBARTarget",
+       "IPMI",
        "DataTable"
 };
 
@@ -806,6 +807,7 @@ acpi_status acpi_ut_init_globals(void)
 
        /* Namespace */
 
+       acpi_gbl_module_code_list = NULL;
        acpi_gbl_root_node = NULL;
        acpi_gbl_root_node_struct.name.integer = ACPI_ROOT_NAME;
        acpi_gbl_root_node_struct.descriptor_type = ACPI_DESC_TYPE_NAMED;