diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cf51f9c1998..ce76b525357 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-31  John Tytgat  <John.Tytgat@aaug.net>
+
+	* config/arm/arm.c (arm_override_options): Remove superfluous test.
+	Fix indentation.
+
 2010-08-31  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* dwarf2out.c (gen_decl_die) <CONST_DECL>: Do not skip in Ada.
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index c5c0b0340f1..cf7070895dd 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -1545,7 +1545,7 @@ arm_override_options (void)
   /* Callee super interworking implies thumb interworking.  Adding
      this to the flags here simplifies the logic elsewhere.  */
   if (TARGET_THUMB && TARGET_CALLEE_INTERWORKING)
-      target_flags |= MASK_INTERWORK;
+    target_flags |= MASK_INTERWORK;
 
   /* TARGET_BACKTRACE calls leaf_function_p, which causes a crash if done
      from here where no function is being compiled currently.  */
@@ -1555,9 +1555,6 @@ arm_override_options (void)
   if (TARGET_ARM && TARGET_CALLEE_INTERWORKING)
     warning (0, "enabling callee interworking support is only meaningful when compiling for the Thumb");
 
-  if (TARGET_ARM && TARGET_CALLER_INTERWORKING)
-    warning (0, "enabling caller interworking support is only meaningful when compiling for the Thumb");
-
   if (TARGET_APCS_STACK && !TARGET_APCS_FRAME)
     {
       warning (0, "-mapcs-stack-check incompatible with -mno-apcs-frame");