diff options
| author | Len Brown <len.brown@intel.com> | 2010-08-15 05:55:57 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-08-15 05:55:57 +0200 |
| commit | ecd8ee0955a2f21914c2e2ffff82541211c5bd43 (patch) | |
| tree | 3987f3d505482a00e9a1d2c44b340d0b71f66d75 /drivers/acpi/acpica | |
| parent | Merge branch 'apei' into release (diff) | |
| parent | ACPI: introduce module parameter acpi.aml_debug_output (diff) | |
| download | linux-ecd8ee0955a2f21914c2e2ffff82541211c5bd43.tar.xz linux-ecd8ee0955a2f21914c2e2ffff82541211c5bd43.zip | |
Merge branch 'procfs-cleanup' into release
Diffstat (limited to 'drivers/acpi/acpica')
| -rw-r--r-- | drivers/acpi/acpica/acglobal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h index 899d68afc3c5..92122292ef1f 100644 --- a/drivers/acpi/acpica/acglobal.h +++ b/drivers/acpi/acpica/acglobal.h @@ -115,7 +115,7 @@ u8 ACPI_INIT_GLOBAL(acpi_gbl_use_default_register_widths, TRUE); /* * Optionally enable output from the AML Debug Object. */ -u8 ACPI_INIT_GLOBAL(acpi_gbl_enable_aml_debug_object, FALSE); +u32 ACPI_INIT_GLOBAL(acpi_gbl_enable_aml_debug_object, FALSE); /* * Optionally copy the entire DSDT to local memory (instead of simply |