aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2010-06-12 00:51:49 -0400
committerLen Brown <len.brown@intel.com>2010-06-12 00:51:49 -0400
commit92634825571d86417941855a8e3189c07aa3c706 (patch)
tree92d30f0714607684642487145ff27ca56b59b9e1 /include
parent7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff)
parent9d3c752de65dbfa6e522f1d666deb0ac152ef367 (diff)
downloadkernel_samsung_smdk4412-92634825571d86417941855a8e3189c07aa3c706.tar.gz
kernel_samsung_smdk4412-92634825571d86417941855a8e3189c07aa3c706.tar.bz2
kernel_samsung_smdk4412-92634825571d86417941855a8e3189c07aa3c706.zip
Merge branch 'gpe-regression-fixes' into release
Diffstat (limited to 'include')
-rw-r--r--include/acpi/actypes.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index bade172cad4..d55f4a7b824 100644
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -663,10 +663,11 @@ typedef u32 acpi_event_status;
#define ACPI_GPE_MAX 0xFF
#define ACPI_NUM_GPE 256
-/* Actions for acpi_set_gpe */
+/* Actions for acpi_set_gpe and acpi_hw_low_set_gpe */
#define ACPI_GPE_ENABLE 0
#define ACPI_GPE_DISABLE 1
+#define ACPI_GPE_COND_ENABLE 2
/* gpe_types for acpi_enable_gpe and acpi_disable_gpe */