diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:31:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:31:12 -0400 |
| commit | 3e370b29d35fb01bfb92c2814d6f79bf6a2cb970 (patch) | |
| tree | 3b8fb467d60bfe6a34686f4abdc3a60050ba40a4 /include/acpi/acdisasm.h | |
| parent | 88d1dce3a74367291f65a757fbdcaf17f042f30c (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirks
Conflicts:
drivers/pci/quirks.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/acpi/acdisasm.h')
| -rw-r--r-- | include/acpi/acdisasm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/acpi/acdisasm.h b/include/acpi/acdisasm.h index 788f88782012..f53faca8ec80 100644 --- a/include/acpi/acdisasm.h +++ b/include/acpi/acdisasm.h | |||
| @@ -162,6 +162,7 @@ extern struct acpi_dmtable_info acpi_dm_table_info_dmar_hdr[]; | |||
| 162 | extern struct acpi_dmtable_info acpi_dm_table_info_dmar_scope[]; | 162 | extern struct acpi_dmtable_info acpi_dm_table_info_dmar_scope[]; |
| 163 | extern struct acpi_dmtable_info acpi_dm_table_info_dmar0[]; | 163 | extern struct acpi_dmtable_info acpi_dm_table_info_dmar0[]; |
| 164 | extern struct acpi_dmtable_info acpi_dm_table_info_dmar1[]; | 164 | extern struct acpi_dmtable_info acpi_dm_table_info_dmar1[]; |
| 165 | extern struct acpi_dmtable_info acpi_dm_table_info_dmar2[]; | ||
| 165 | extern struct acpi_dmtable_info acpi_dm_table_info_ecdt[]; | 166 | extern struct acpi_dmtable_info acpi_dm_table_info_ecdt[]; |
| 166 | extern struct acpi_dmtable_info acpi_dm_table_info_einj[]; | 167 | extern struct acpi_dmtable_info acpi_dm_table_info_einj[]; |
| 167 | extern struct acpi_dmtable_info acpi_dm_table_info_einj0[]; | 168 | extern struct acpi_dmtable_info acpi_dm_table_info_einj0[]; |