summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-08-25 01:40:27 -0400
committerLen Brown <len.brown@intel.com>2007-08-25 01:40:27 -0400
commita4fd4946214fae86610b989c47e5ae762cc96ddb (patch)
tree67ae652556f3b0eb785ffb1a2d793996886052f5 /include
parenta3a1b26e79db743c3289632238cd5f930f91bf27 (diff)
parent5e1f198bbfcffa1e3b9091b4ca7032c2d07fde81 (diff)
downloadlinux-a4fd4946214fae86610b989c47e5ae762cc96ddb.tar.bz2
Pull misc into release branch
Diffstat (limited to 'include')
-rw-r--r--include/acpi/acpixf.h2
-rw-r--r--include/acpi/acstruct.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index b5cca5daa348..3d7ab9e0c9fe 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -130,7 +130,7 @@ acpi_walk_namespace(acpi_object_type type,
void *context, void **return_value);
acpi_status
-acpi_get_devices(char *HID,
+acpi_get_devices(const char *HID,
acpi_walk_callback user_function,
void *context, void **return_value);
diff --git a/include/acpi/acstruct.h b/include/acpi/acstruct.h
index aeb4498e5e06..88482655407f 100644
--- a/include/acpi/acstruct.h
+++ b/include/acpi/acstruct.h
@@ -146,7 +146,7 @@ struct acpi_init_walk_info {
struct acpi_get_devices_info {
acpi_walk_callback user_function;
void *context;
- char *hid;
+ const char *hid;
};
union acpi_aml_operands {