summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2010-08-14 23:55:57 -0400
committerLen Brown <len.brown@intel.com>2010-08-14 23:55:57 -0400
commitecd8ee0955a2f21914c2e2ffff82541211c5bd43 (patch)
tree3987f3d505482a00e9a1d2c44b340d0b71f66d75 /include
parentfeb29c5175e61d0f1ec2cbcaccdfa55e588780be (diff)
parentc637e4861c7db8165d0f438db3829e7878c96059 (diff)
downloadlinux-3.10-ecd8ee0955a2f21914c2e2ffff82541211c5bd43.tar.gz
linux-3.10-ecd8ee0955a2f21914c2e2ffff82541211c5bd43.tar.bz2
linux-3.10-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 1371cc99739..a6ea2ac40b9 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;