diff options
| author | Len Brown <len.brown@intel.com> | 2004-12-06 05:58:53 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2004-12-06 05:58:53 -0500 |
| commit | 4a5b708dc6252decdc1aa4a2b817f4fd1c865f6e (patch) | |
| tree | 2cc3d3fda45b1e3c40a8b04385a9038c2ea666e4 /include/acpi | |
| parent | dbfb6de758c26da688f684f21b5d8dcc2ff112a6 (diff) | |
| parent | 8bef09b9baf0ed9663f230f2455ac395a0de6b69 (diff) | |
merge
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/acpixf.h | 2 | ||||
| -rw-r--r-- | include/acpi/processor.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h index 1b6eff5c3113..829c4e2bfd36 100644 --- a/include/acpi/acpixf.h +++ b/include/acpi/acpixf.h @@ -345,11 +345,11 @@ acpi_disable_event ( u32 event, u32 flags); -#ifdef ACPI_FUTURE_USAGE acpi_status acpi_clear_event ( u32 event); +#ifdef ACPI_FUTURE_USAGE acpi_status acpi_get_event_status ( u32 event, diff --git a/include/acpi/processor.h b/include/acpi/processor.h index 055e97ca13e9..3982834e96ad 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h @@ -17,7 +17,7 @@ struct acpi_processor_cx_policy { u32 count; - int state; + u32 state; struct { u32 time; u32 ticks; @@ -38,8 +38,8 @@ struct acpi_processor_cx { }; struct acpi_processor_power { - int state; - int default_state; + u32 state; + u32 default_state; u32 bm_activity; struct acpi_processor_cx states[ACPI_PROCESSOR_MAX_POWER]; }; |