diff options
| author | Len Brown <len.brown@intel.com> | 2009-01-09 03:37:48 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-01-09 03:37:48 -0500 |
| commit | d0302bc62af7983040ea1cd1b5dd2b36e1a6a509 (patch) | |
| tree | ef45618ae057e21fff7c82190939fe5f4466cf06 /include | |
| parent | 106ad8d6b0a7c1a597fab56ec692c39f553fabbc (diff) | |
| parent | 237889bf0a62f1399fb2ba0c2a259e6a96597131 (diff) | |
Merge branch 'misc' into release
Conflicts:
include/acpi/acpixf.h
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/acpixf.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h index 7c7074f20087..c8e8cf45830f 100644 --- a/include/acpi/acpixf.h +++ b/include/acpi/acpixf.h | |||
| @@ -70,6 +70,7 @@ extern u32 acpi_gbl_trace_flags; | |||
| 70 | extern u32 acpi_current_gpe_count; | 70 | extern u32 acpi_current_gpe_count; |
| 71 | extern struct acpi_table_fadt acpi_gbl_FADT; | 71 | extern struct acpi_table_fadt acpi_gbl_FADT; |
| 72 | 72 | ||
| 73 | extern u32 acpi_rsdt_forced; | ||
| 73 | /* | 74 | /* |
| 74 | * Global interfaces | 75 | * Global interfaces |
| 75 | */ | 76 | */ |