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/acglobal.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/acglobal.h')
| -rw-r--r-- | include/acpi/acglobal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/acglobal.h b/include/acpi/acglobal.h index 74ad971241db..15dda46b70d1 100644 --- a/include/acpi/acglobal.h +++ b/include/acpi/acglobal.h | |||
| @@ -140,7 +140,7 @@ ACPI_EXTERN u32 acpi_gbl_trace_flags; | |||
| 140 | */ | 140 | */ |
| 141 | ACPI_EXTERN struct acpi_internal_rsdt acpi_gbl_root_table_list; | 141 | ACPI_EXTERN struct acpi_internal_rsdt acpi_gbl_root_table_list; |
| 142 | ACPI_EXTERN struct acpi_table_fadt acpi_gbl_FADT; | 142 | ACPI_EXTERN struct acpi_table_fadt acpi_gbl_FADT; |
| 143 | extern acpi_native_uint acpi_gbl_permanent_mmap; | 143 | extern u8 acpi_gbl_permanent_mmap; |
| 144 | 144 | ||
| 145 | /* These addresses are calculated from FADT address values */ | 145 | /* These addresses are calculated from FADT address values */ |
| 146 | 146 | ||