summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2010-08-15 05:55:57 +0200
committerLen Brown <len.brown@intel.com>2010-08-15 05:55:57 +0200
commitecd8ee0955a2f21914c2e2ffff82541211c5bd43 (patch)
tree3987f3d505482a00e9a1d2c44b340d0b71f66d75 /include
parentMerge branch 'apei' into release (diff)
parentACPI: introduce module parameter acpi.aml_debug_output (diff)
downloadlinux-ecd8ee0955a2f21914c2e2ffff82541211c5bd43.tar.xz
linux-ecd8ee0955a2f21914c2e2ffff82541211c5bd43.zip
Merge branch 'procfs-cleanup' into release
Diffstat (limited to 'include')
-rw-r--r--include/acpi/acpixf.h2
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;
extern u8 acpi_gbl_use_default_register_widths;
extern acpi_name acpi_gbl_trace_method_name;
extern u32 acpi_gbl_trace_flags;
-extern u8 acpi_gbl_enable_aml_debug_object;
+extern u32 acpi_gbl_enable_aml_debug_object;
extern u8 acpi_gbl_copy_dsdt_locally;
extern u8 acpi_gbl_truncate_io_addresses;