diff options
| author | Len Brown <len.brown@intel.com> | 2007-08-25 01:40:27 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-08-25 01:40:27 -0400 |
| commit | a4fd4946214fae86610b989c47e5ae762cc96ddb (patch) | |
| tree | 67ae652556f3b0eb785ffb1a2d793996886052f5 /include/acpi | |
| parent | a3a1b26e79db743c3289632238cd5f930f91bf27 (diff) | |
| parent | 5e1f198bbfcffa1e3b9091b4ca7032c2d07fde81 (diff) | |
Pull misc into release branch
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/acpixf.h | 2 | ||||
| -rw-r--r-- | include/acpi/acstruct.h | 2 |
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, | |||
| 130 | void *context, void **return_value); | 130 | void *context, void **return_value); |
| 131 | 131 | ||
| 132 | acpi_status | 132 | acpi_status |
| 133 | acpi_get_devices(char *HID, | 133 | acpi_get_devices(const char *HID, |
| 134 | acpi_walk_callback user_function, | 134 | acpi_walk_callback user_function, |
| 135 | void *context, void **return_value); | 135 | void *context, void **return_value); |
| 136 | 136 | ||
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 { | |||
| 146 | struct acpi_get_devices_info { | 146 | struct acpi_get_devices_info { |
| 147 | acpi_walk_callback user_function; | 147 | acpi_walk_callback user_function; |
| 148 | void *context; | 148 | void *context; |
| 149 | char *hid; | 149 | const char *hid; |
| 150 | }; | 150 | }; |
| 151 | 151 | ||
| 152 | union acpi_aml_operands { | 152 | union acpi_aml_operands { |