summaryrefslogtreecommitdiffstats
path: root/include/acpi/acexcep.h
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2013-01-29 23:59:09 +0100
committerH. Peter Anvin <hpa@linux.intel.com>2013-01-30 00:10:15 +0100
commitde65d816aa44f9ddd79861ae21d75010cc1fd003 (patch)
tree04a637a43b2e52a733d0dcb7595a47057571e7da /include/acpi/acexcep.h
parentx86, mm: Let "memmap=" take more entries one time (diff)
parentx86, boot: Sanitize boot_params if not zeroed on creation (diff)
downloadlinux-de65d816aa44f9ddd79861ae21d75010cc1fd003.tar.xz
linux-de65d816aa44f9ddd79861ae21d75010cc1fd003.zip
Merge remote-tracking branch 'origin/x86/boot' into x86/mm2
Coming patches to x86/mm2 require the changes and advanced baseline in x86/boot. Resolved Conflicts: arch/x86/kernel/setup.c mm/nobootmem.c Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'include/acpi/acexcep.h')
-rw-r--r--include/acpi/acexcep.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/acexcep.h b/include/acpi/acexcep.h
index 19503449814f..6c3890e02140 100644
--- a/include/acpi/acexcep.h
+++ b/include/acpi/acexcep.h
@@ -122,7 +122,7 @@
#define AE_CODE_TBL_MAX 0x0005
/*
- * AML exceptions. These are caused by problems with
+ * AML exceptions. These are caused by problems with
* the actual AML byte stream
*/
#define AE_AML_BAD_OPCODE (acpi_status) (0x0001 | AE_CODE_AML)