diff options
author | Len Brown <len.brown@intel.com> | 2008-02-07 09:13:36 +0100 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-02-07 09:13:36 +0100 |
commit | e5e54bc86a1fed9849b22fd736c30b23c4719046 (patch) | |
tree | c53d0d5a7d6e2806bc154f8fc1642ec7a6684ca1 /include/acpi | |
parent | Merge branches 'release', 'misc' and 'misc-2.6.25' into release (diff) | |
parent | ACPI: create /sys/firmware/acpi/interrupts (diff) | |
download | linux-e5e54bc86a1fed9849b22fd736c30b23c4719046.tar.xz linux-e5e54bc86a1fed9849b22fd736c30b23c4719046.zip |
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 347a911d8237..47a1fd8f2d8a 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 ca882b8e7d10..1a16cfbe9e0d 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 */ |