Merge branch 'linus' into x86/urgent, to pick up dependent changes

[linux-2.6-microblaze.git] / include / linux / acpi.h

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index e22c237..98440df 100644 (file)
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -517,7 +517,8 @@ extern bool osc_pc_lpi_support_confirmed;
 #define OSC_PCI_CLOCK_PM_SUPPORT               0x00000004
 #define OSC_PCI_SEGMENT_GROUPS_SUPPORT         0x00000008
 #define OSC_PCI_MSI_SUPPORT                    0x00000010
-#define OSC_PCI_SUPPORT_MASKS                  0x0000001f
+#define OSC_PCI_HPX_TYPE_3_SUPPORT             0x00000100
+#define OSC_PCI_SUPPORT_MASKS                  0x0000011f
 
 /* PCI Host Bridge _OSC: Capabilities DWORD 3: Control Field */
 #define OSC_PCI_EXPRESS_NATIVE_HP_CONTROL      0x00000001