summaryrefslogtreecommitdiffstats
path: root/include/linux/acpi.h
diff options
context:
space:
mode:
authorBjorn Helgaas2013-09-05 23:07:39 +0200
committerBjorn Helgaas2013-09-24 01:40:45 +0200
commit7dab9ef4f0823072a3c9afdb3b373c9f2f38848b (patch)
treed57293c7b2705bd34812c073a2919904c194d359 /include/linux/acpi.h
parentACPI: Write OSC_PCI_CONTROL_MASKS like OSC_PCI_SUPPORT_MASKS (diff)
downloadkernel-qcow2-linux-7dab9ef4f0823072a3c9afdb3b373c9f2f38848b.tar.gz
kernel-qcow2-linux-7dab9ef4f0823072a3c9afdb3b373c9f2f38848b.tar.xz
kernel-qcow2-linux-7dab9ef4f0823072a3c9afdb3b373c9f2f38848b.zip
PCI/ACPI: Name _OSC #defines more consistently
Make PCI Host Bridge _OSC #defines more consistent. No functional change. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'include/linux/acpi.h')
-rw-r--r--include/linux/acpi.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index bb4e7701b26b..e2e52cf53224 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -325,19 +325,19 @@ acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context);
extern bool osc_sb_apei_support_acked;
/* PCI Host Bridge _OSC: Capabilities DWORD 2: Support Field */
-#define OSC_EXT_PCI_CONFIG_SUPPORT 0x00000001
-#define OSC_ACTIVE_STATE_PWR_SUPPORT 0x00000002
-#define OSC_CLOCK_PWR_CAPABILITY_SUPPORT 0x00000004
+#define OSC_PCI_EXT_CONFIG_SUPPORT 0x00000001
+#define OSC_PCI_ASPM_SUPPORT 0x00000002
+#define OSC_PCI_CLOCK_PM_SUPPORT 0x00000004
#define OSC_PCI_SEGMENT_GROUPS_SUPPORT 0x00000008
-#define OSC_MSI_SUPPORT 0x00000010
+#define OSC_PCI_MSI_SUPPORT 0x00000010
#define OSC_PCI_SUPPORT_MASKS 0x0000001f
/* PCI Host Bridge _OSC: Capabilities DWORD 3: Control Field */
#define OSC_PCI_EXPRESS_NATIVE_HP_CONTROL 0x00000001
-#define OSC_SHPC_NATIVE_HP_CONTROL 0x00000002
+#define OSC_PCI_SHPC_NATIVE_HP_CONTROL 0x00000002
#define OSC_PCI_EXPRESS_PME_CONTROL 0x00000004
#define OSC_PCI_EXPRESS_AER_CONTROL 0x00000008
-#define OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL 0x00000010
+#define OSC_PCI_EXPRESS_CAPABILITY_CONTROL 0x00000010
#define OSC_PCI_CONTROL_MASKS 0x0000001f
extern acpi_status acpi_pci_osc_control_set(acpi_handle handle,