diff options
| author | Len Brown <len.brown@intel.com> | 2010-08-14 23:55:57 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-08-14 23:55:57 -0400 |
| commit | ecd8ee0955a2f21914c2e2ffff82541211c5bd43 (patch) | |
| tree | 3987f3d505482a00e9a1d2c44b340d0b71f66d75 /include | |
| parent | feb29c5175e61d0f1ec2cbcaccdfa55e588780be (diff) | |
| parent | c637e4861c7db8165d0f438db3829e7878c96059 (diff) | |
Merge branch 'procfs-cleanup' into release
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/acpixf.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h index 1371cc997393..a6ea2ac40b9c 100644 --- a/include/acpi/acpixf.h +++ b/include/acpi/acpixf.h | |||
| @@ -67,7 +67,7 @@ extern u8 acpi_gbl_leave_wake_gpes_disabled; | |||
| 67 | extern u8 acpi_gbl_use_default_register_widths; | 67 | extern u8 acpi_gbl_use_default_register_widths; |
| 68 | extern acpi_name acpi_gbl_trace_method_name; | 68 | extern acpi_name acpi_gbl_trace_method_name; |
| 69 | extern u32 acpi_gbl_trace_flags; | 69 | extern u32 acpi_gbl_trace_flags; |
| 70 | extern u8 acpi_gbl_enable_aml_debug_object; | 70 | extern u32 acpi_gbl_enable_aml_debug_object; |
| 71 | extern u8 acpi_gbl_copy_dsdt_locally; | 71 | extern u8 acpi_gbl_copy_dsdt_locally; |
| 72 | extern u8 acpi_gbl_truncate_io_addresses; | 72 | extern u8 acpi_gbl_truncate_io_addresses; |
| 73 | 73 | ||