Merge tag 'iommu-updates-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 8d15fc5..d5f0174 100644 (file)
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -241,10 +241,6 @@ int __init acpi_table_parse_entries(char *id, unsigned long table_size,
                              int entry_id,
                              acpi_tbl_entry_handler handler,
                              unsigned int max_entries);
-int __init acpi_table_parse_entries(char *id, unsigned long table_size,
-                             int entry_id,
-                             acpi_tbl_entry_handler handler,
-                             unsigned int max_entries);
 int __init acpi_table_parse_entries_array(char *id, unsigned long table_size,
                              struct acpi_subtable_proc *proc, int proc_num,
                              unsigned int max_entries);
@@ -490,6 +486,7 @@ acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context);
 #define OSC_SB_CPCV2_SUPPORT                   0x00000040
 #define OSC_SB_PCLPI_SUPPORT                   0x00000080
 #define OSC_SB_OSLPI_SUPPORT                   0x00000100
+#define OSC_SB_CPC_DIVERSE_HIGH_SUPPORT                0x00001000
 
 extern bool osc_sb_apei_support_acked;
 extern bool osc_pc_lpi_support_confirmed;