summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/exresop.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2013-11-14 08:28:30 +0100
committerIngo Molnar <mingo@kernel.org>2013-11-14 08:28:30 +0100
commit555a098af6086256bc64d3806519f37ccae936e0 (patch)
tree4f13126483fc1202d23f1ba55045fac41d19118e /drivers/acpi/acpica/exresop.c
parentMerge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/... (diff)
parentMerge tag 'fbdev-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba... (diff)
downloadlinux-555a098af6086256bc64d3806519f37ccae936e0.tar.xz
linux-555a098af6086256bc64d3806519f37ccae936e0.zip
Merge branch 'linus' into perf/urgent
Merge dependencies to apply a fix. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/acpi/acpica/exresop.c')
-rw-r--r--drivers/acpi/acpica/exresop.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/exresop.c b/drivers/acpi/acpica/exresop.c
index 00e5af7129c1..be3f66973ee8 100644
--- a/drivers/acpi/acpica/exresop.c
+++ b/drivers/acpi/acpica/exresop.c
@@ -683,7 +683,7 @@ acpi_ex_resolve_operands(u16 opcode,
return_ACPI_STATUS(status);
}
- next_operand:
+next_operand:
/*
* If more operands needed, decrement stack_ptr to point
* to next operand on stack