diff options
| author | Len Brown <len.brown@intel.com> | 2010-06-12 00:51:49 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-06-12 00:51:49 -0400 |
| commit | 92634825571d86417941855a8e3189c07aa3c706 (patch) | |
| tree | 92d30f0714607684642487145ff27ca56b59b9e1 /include/acpi | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
| parent | 9d3c752de65dbfa6e522f1d666deb0ac152ef367 (diff) | |
Merge branch 'gpe-regression-fixes' into release
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/actypes.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h index bade172cad47..d55f4a7b824d 100644 --- a/include/acpi/actypes.h +++ b/include/acpi/actypes.h | |||
| @@ -663,10 +663,11 @@ typedef u32 acpi_event_status; | |||
| 663 | #define ACPI_GPE_MAX 0xFF | 663 | #define ACPI_GPE_MAX 0xFF |
| 664 | #define ACPI_NUM_GPE 256 | 664 | #define ACPI_NUM_GPE 256 |
| 665 | 665 | ||
| 666 | /* Actions for acpi_set_gpe */ | 666 | /* Actions for acpi_set_gpe and acpi_hw_low_set_gpe */ |
| 667 | 667 | ||
| 668 | #define ACPI_GPE_ENABLE 0 | 668 | #define ACPI_GPE_ENABLE 0 |
| 669 | #define ACPI_GPE_DISABLE 1 | 669 | #define ACPI_GPE_DISABLE 1 |
| 670 | #define ACPI_GPE_COND_ENABLE 2 | ||
| 670 | 671 | ||
| 671 | /* gpe_types for acpi_enable_gpe and acpi_disable_gpe */ | 672 | /* gpe_types for acpi_enable_gpe and acpi_disable_gpe */ |
| 672 | 673 | ||