summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/exutils.c
diff options
context:
space:
mode:
authorLucas De Marchi <lucas.de.marchi@gmail.com>2010-09-07 18:49:45 +0200
committerLen Brown <len.brown@intel.com>2010-09-29 03:38:19 +0200
commit58f87ed0d45141a90167f34c0959d607160a26df (patch)
treec9c279958afd9c05d466a2f05b59d4e74d9423af /drivers/acpi/acpica/exutils.c
parentACPI video: fix a poor warning message (diff)
downloadlinux-58f87ed0d45141a90167f34c0959d607160a26df.tar.xz
linux-58f87ed0d45141a90167f34c0959d607160a26df.zip
ACPI: Fix typos
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/acpica/exutils.c')
-rw-r--r--drivers/acpi/acpica/exutils.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/exutils.c b/drivers/acpi/acpica/exutils.c
index 74c24d517f81..4093522eed45 100644
--- a/drivers/acpi/acpica/exutils.c
+++ b/drivers/acpi/acpica/exutils.c
@@ -109,7 +109,7 @@ void acpi_ex_enter_interpreter(void)
*
* DESCRIPTION: Reacquire the interpreter execution region from within the
* interpreter code. Failure to enter the interpreter region is a
- * fatal system error. Used in conjuction with
+ * fatal system error. Used in conjunction with
* relinquish_interpreter
*
******************************************************************************/