diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-29 15:30:24 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-29 15:30:24 +1100 |
| commit | 36ee73d2eea0625e72526342c7770335ea9ebbc7 (patch) | |
| tree | 7c10263bb28c0d447e93b2f18f929bff72bea6a0 /drivers/acpi/utilities/utglobal.c | |
| parent | bb21b6be719450d43ef87813c2fbe02c0b9c8a23 (diff) | |
| parent | ef9e87db2e46e675d11955215d49b99a27e15c84 (diff) | |
Merge commit 'acpi/test'
Diffstat (limited to 'drivers/acpi/utilities/utglobal.c')
| -rw-r--r-- | drivers/acpi/utilities/utglobal.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/utilities/utglobal.c b/drivers/acpi/utilities/utglobal.c index 17ed5ac840f7..211d621f42a9 100644 --- a/drivers/acpi/utilities/utglobal.c +++ b/drivers/acpi/utilities/utglobal.c @@ -352,7 +352,7 @@ const char *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS] = { "PCI_Config", "EmbeddedControl", "SMBus", - "CMOS", + "SystemCMOS", "PCIBARTarget", "DataTable" }; @@ -771,6 +771,7 @@ acpi_status acpi_ut_init_globals(void) acpi_gbl_global_lock_mutex = NULL; acpi_gbl_global_lock_acquired = FALSE; acpi_gbl_global_lock_handle = 0; + acpi_gbl_global_lock_present = FALSE; /* Miscellaneous variables */ |