diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 50c7a1c650b..8cf7745a012 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-10  DJ Delorie  <dj@redhat.com>
+
+	* config/mep/mep.c (mep_can_inline_p): Correct logic, and simplify.
+
 2009-07-10  Mark Mitchell  <mark@codesourcery.com>
 
 	* config/arm/thumb2.md (thumb2_cbz): Correct computation of length
diff --git a/gcc/config/mep/mep.c b/gcc/config/mep/mep.c
index 59dbb8895cd..33bde90efc4 100644
--- a/gcc/config/mep/mep.c
+++ b/gcc/config/mep/mep.c
@@ -4115,14 +4115,12 @@ mep_can_inline_p (tree caller, tree callee)
   if (TREE_CODE (callee) == ADDR_EXPR)
     callee = TREE_OPERAND (callee, 0);
  
-  if (TREE_CODE (callee) == FUNCTION_DECL
-      && DECL_DECLARED_INLINE_P (callee)
-      && !mep_vliw_function_p (caller)
+  if (!mep_vliw_function_p (caller)
       && mep_vliw_function_p (callee))
     {
-      return true;
+      return false;
     }
-  return false;
+  return true;
 }
 
 #define FUNC_CALL		1