diff options
| author | Len Brown <len.brown@intel.com> | 2008-02-07 03:13:36 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-02-07 03:13:36 -0500 |
| commit | e5e54bc86a1fed9849b22fd736c30b23c4719046 (patch) | |
| tree | c53d0d5a7d6e2806bc154f8fc1642ec7a6684ca1 /include/acpi | |
| parent | 70ec75c5b8e0bda7a16fb387f91e08545f379a0e (diff) | |
| parent | 5229e87d59cef33539322948bd8e3b5a537f7c97 (diff) | |
| download | kernel_samsung_aries-e5e54bc86a1fed9849b22fd736c30b23c4719046.zip kernel_samsung_aries-e5e54bc86a1fed9849b22fd736c30b23c4719046.tar.gz kernel_samsung_aries-e5e54bc86a1fed9849b22fd736c30b23c4719046.tar.bz2 | |
Merge branches 'release' and 'stats' into release
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/acglobal.h | 4 | ||||
| -rw-r--r-- | include/acpi/acpiosxf.h | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/acpi/acglobal.h b/include/acpi/acglobal.h index 347a911..47a1fd8 100644 --- a/include/acpi/acglobal.h +++ b/include/acpi/acglobal.h @@ -117,10 +117,6 @@ extern u32 acpi_dbg_layer; extern u32 acpi_gbl_nesting_level; -/* Event counters */ - -ACPI_EXTERN u32 acpi_gpe_count; - /* Support for dynamic control method tracing mechanism */ ACPI_EXTERN u32 acpi_gbl_original_dbg_level; diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h index ca882b8..1a16cfb 100644 --- a/include/acpi/acpiosxf.h +++ b/include/acpi/acpiosxf.h @@ -181,6 +181,9 @@ acpi_os_install_interrupt_handler(u32 gsi, acpi_status acpi_os_remove_interrupt_handler(u32 gsi, acpi_osd_handler service_routine); +void acpi_os_gpe_count(u32 gpe_number); +void acpi_os_fixed_event_count(u32 fixed_event_number); + /* * Threads and Scheduling */ |