Merge branch 'i2c/for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...

[mirror_ubuntu-artful-kernel.git] / include / linux / acpi.h

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 5320153c311ba1e5e5a4765f84d9f264351cc365..807cbc46d73e0eda897c3e1a3aa2df7ae9519c81 100644 (file)
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -364,6 +364,17 @@ extern bool osc_sb_apei_support_acked;
 #define OSC_PCI_EXPRESS_CAPABILITY_CONTROL     0x00000010
 #define OSC_PCI_CONTROL_MASKS                  0x0000001f
 
+#define ACPI_GSB_ACCESS_ATTRIB_QUICK           0x00000002
+#define ACPI_GSB_ACCESS_ATTRIB_SEND_RCV         0x00000004
+#define ACPI_GSB_ACCESS_ATTRIB_BYTE            0x00000006
+#define ACPI_GSB_ACCESS_ATTRIB_WORD            0x00000008
+#define ACPI_GSB_ACCESS_ATTRIB_BLOCK           0x0000000A
+#define ACPI_GSB_ACCESS_ATTRIB_MULTIBYTE       0x0000000B
+#define ACPI_GSB_ACCESS_ATTRIB_WORD_CALL       0x0000000C
+#define ACPI_GSB_ACCESS_ATTRIB_BLOCK_CALL      0x0000000D
+#define ACPI_GSB_ACCESS_ATTRIB_RAW_BYTES       0x0000000E
+#define ACPI_GSB_ACCESS_ATTRIB_RAW_PROCESS     0x0000000F
+
 extern acpi_status acpi_pci_osc_control_set(acpi_handle handle,
                                             u32 *mask, u32 req);