aboutsummaryrefslogtreecommitdiff
path: root/qerror.c
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2011-12-14 07:59:21 -0600
committerAnthony Liguori <aliguori@us.ibm.com>2011-12-14 07:59:21 -0600
commit9423a2e8dd362a271bfe194ec131062814557b95 (patch)
tree6b10b2d69e5d81b6ff4cb2ba75693d8a65362d92 /qerror.c
parentda5361cc685c004d8bb4e7c5e7b3a52c7aca2c56 (diff)
parent126c79133f77d1b0b7c3849899c6d5f83b2fd410 (diff)
downloadqemu-9423a2e8dd362a271bfe194ec131062814557b95.zip
qemu-9423a2e8dd362a271bfe194ec131062814557b95.tar.gz
qemu-9423a2e8dd362a271bfe194ec131062814557b95.tar.bz2
Merge remote-tracking branch 'stefanha/trivial-patches-next' into staging
Diffstat (limited to 'qerror.c')
-rw-r--r--qerror.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/qerror.c b/qerror.c
index a8ecb0f..830c9c3 100644
--- a/qerror.c
+++ b/qerror.c
@@ -261,7 +261,7 @@ static const QErrorStringTable qerror_table[] = {
},
{
.error_fmt = QERR_INVALID_PARAMETER_COMBINATION,
- .desc = "Invalid paramter combination",
+ .desc = "Invalid parameter combination",
},
{}
};