X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Facpi%2Faclocal.h;h=b221c8583dddf22966e65b3e974d508e17f43079;hb=04a0551c87363f100b04d28d7a15a632b70e18e7;hp=c5cdc32ac2f8f623deb3515bd367a4fca2ee5da7;hpb=c203e45f069af47ca7623e4dcd8c00bfba2722e4;p=linux-2.6

diff --git a/include/acpi/aclocal.h b/include/acpi/aclocal.h
index c5cdc32ac2..b221c8583d 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;