diff --git a/gas/ChangeLog b/gas/ChangeLog
index dcc44a5ecb6..d6bffc19099 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+2010-03-21  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* config/tc-i386.c (i386_error): Replace oprand_size_mismatch
+	with operand_size_mismatch.
+	(operand_size_match): Updated.
+	(match_template): Likewise.
+
 2010-03-21  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* config/tc-i386.c (i386_error): New.
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 6def7691cba..c4603a73177 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -206,7 +206,7 @@ union i386_op
 
 enum i386_error
   {
-    oprand_size_mismatch,
+    operand_size_mismatch,
     operand_type_mismatch,
     register_type_mismatch,
     number_of_operands_mismatch,
@@ -1579,7 +1579,7 @@ operand_size_match (const insn_template *t)
   else if (!t->opcode_modifier.d && !t->opcode_modifier.floatd)
     {
 mismatch:
-      i.error = oprand_size_mismatch;
+      i.error = operand_size_mismatch;
       return 0;
     }
 
@@ -4109,7 +4109,7 @@ check_reverse:
 	{
 	default:
 	  abort ();
-	case oprand_size_mismatch:
+	case operand_size_mismatch:
 	  err_msg = _("operand size mismatch");
 	  break;
 	case operand_type_mismatch: