diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:53:16 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:53:16 +0200 |
| commit | cdbfc557c43ea1f1f9b7062300ecb1254969814b (patch) | |
| tree | 255f1cf62cea2c3dec208799a00a116e714a6128 /include/acpi/aclocal.h | |
| parent | 4d8cc874d7ed43eda72765e9c0e141e170fee4f3 (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into x86/cleanups
Diffstat (limited to 'include/acpi/aclocal.h')
| -rw-r--r-- | include/acpi/aclocal.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/acpi/aclocal.h b/include/acpi/aclocal.h index c5cdc32ac2f..b221c8583dd 100644 --- a/include/acpi/aclocal.h +++ b/include/acpi/aclocal.h @@ -98,8 +98,8 @@ union acpi_parse_object; static char *acpi_gbl_mutex_names[ACPI_NUM_MUTEX] = { "ACPI_MTX_Interpreter", - "ACPI_MTX_Tables", "ACPI_MTX_Namespace", + "ACPI_MTX_Tables", "ACPI_MTX_Events", "ACPI_MTX_Caches", "ACPI_MTX_Memory", @@ -282,8 +282,8 @@ struct acpi_predefined_names { /* Info structure used to convert external<->internal namestrings */ struct acpi_namestring_info { - char *external_name; - char *next_external_char; + const char *external_name; + const char *next_external_char; char *internal_name; u32 length; u32 num_segments; |