diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e0c4c31b77fc..230aab688db4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-09  DJ Delorie  <dj@redhat.com>
+
+	* config/mep/mep.c (mep_option_can_inline_p): Remove error call.
+
 2009-07-09  Tom Tromey  <tromey@redhat.com>
 
 	* unwind-dw2-fde-darwin.c: Include dwarf2.h.
diff --git a/gcc/config/mep/mep.c b/gcc/config/mep/mep.c
index 9b489f9c14a6..71755a34e194 100644
--- a/gcc/config/mep/mep.c
+++ b/gcc/config/mep/mep.c
@@ -4120,7 +4120,6 @@ mep_option_can_inline_p (tree caller, tree callee)
       && !mep_vliw_function_p (caller)
       && mep_vliw_function_p (callee))
     {
-      error ("cannot call inline VLIW functions from core functions");
       return true;
     }
   return false;