diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 670b06ccf47..ced279d4adf 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-21  DJ Delorie  <dj@redhat.com>
+
+	* config/mep/mep.c (mep_legitimize_arg): Leave control registers
+	alone too.
+
 2009-07-21  Jason Merrill  <jason@redhat.com>
 
 	* c-common.c (max_tinst_depth): Increase default to 1024.
diff --git a/gcc/config/mep/mep.c b/gcc/config/mep/mep.c
index 80d20184055..a5869ca1c18 100644
--- a/gcc/config/mep/mep.c
+++ b/gcc/config/mep/mep.c
@@ -6204,7 +6204,9 @@ mep_legitimize_arg (const struct insn_operand_data *operand, rtx arg,
   /* But not for control registers.  */
   if (operand->constraint[0] == '='
       && (! REG_P (arg)
-	  || ! (CCR_REGNO_P (REGNO (arg)) || CR_REGNO_P (REGNO (arg)))
+	  || ! (CONTROL_REGNO_P (REGNO (arg))
+		|| CCR_REGNO_P (REGNO (arg))
+		|| CR_REGNO_P (REGNO (arg)))
 	  ))
     return gen_reg_rtx (operand->mode);