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 /drivers/acpi/events | |
| parent | 70ec75c5b8e0bda7a16fb387f91e08545f379a0e (diff) | |
| parent | 5229e87d59cef33539322948bd8e3b5a537f7c97 (diff) | |
| download | linux-e5e54bc86a1fed9849b22fd736c30b23c4719046.tar.gz linux-e5e54bc86a1fed9849b22fd736c30b23c4719046.tar.bz2 linux-e5e54bc86a1fed9849b22fd736c30b23c4719046.zip | |
Merge branches 'release' and 'stats' into release
Diffstat (limited to 'drivers/acpi/events')
| -rw-r--r-- | drivers/acpi/events/evevent.c | 2 | ||||
| -rw-r--r-- | drivers/acpi/events/evgpe.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/events/evevent.c b/drivers/acpi/events/evevent.c index e41287815ea1..3048801a37b5 100644 --- a/drivers/acpi/events/evevent.c +++ b/drivers/acpi/events/evevent.c @@ -259,7 +259,7 @@ u32 acpi_ev_fixed_event_detect(void) enable_bit_mask)) { /* Found an active (signalled) event */ - + acpi_os_fixed_event_count(i); int_status |= acpi_ev_fixed_event_dispatch((u32) i); } } diff --git a/drivers/acpi/events/evgpe.c b/drivers/acpi/events/evgpe.c index 31cb8cd8cabe..0dadd2adc800 100644 --- a/drivers/acpi/events/evgpe.c +++ b/drivers/acpi/events/evgpe.c @@ -627,7 +627,7 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number) ACPI_FUNCTION_TRACE(ev_gpe_dispatch); - acpi_gpe_count++; + acpi_os_gpe_count(gpe_number); /* * If edge-triggered, clear the GPE status bit now. Note that |