diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1d02f567da..1a7c89d018 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-30  Pedro Alves  <pedro@codesourcery.com>
+
+	* target.h (enum inferior_event_type): Delete INF_ERROR.
+	* inf-loop.c (inferior_event_handler): Don't handle INF_ERROR.
+
 2011-05-30  Pedro Alves  <pedro@codesourcery.com>
 
 	* interps.c (interp_set): Don't cancel continuations.
diff --git a/gdb/inf-loop.c b/gdb/inf-loop.c
index 0ab372c784..8e19eef299 100644
--- a/gdb/inf-loop.c
+++ b/gdb/inf-loop.c
@@ -51,14 +51,6 @@ inferior_event_handler (enum inferior_event_type event_type,
 
   switch (event_type)
     {
-    case INF_ERROR:
-      printf_unfiltered (_("error detected from target.\n"));
-      pop_all_targets_above (file_stratum, 0);
-      discard_all_intermediate_continuations ();
-      discard_all_continuations ();
-      async_enable_stdin ();
-      break;
-
     case INF_REG_EVENT:
       /* Use catch errors for now, until the inner layers of
 	 fetch_inferior_event (i.e. readchar) can return meaningful
diff --git a/gdb/target.h b/gdb/target.h
index 21e14501eb..1c7fcd29e6 100644
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -206,8 +206,6 @@ enum inferior_event_type
     /* Process a normal inferior event which will result in target_wait
        being called.  */
     INF_REG_EVENT,
-    /* Deal with an error on the inferior.  */
-    INF_ERROR,
     /* We are called because a timer went off.  */
     INF_TIMER,
     /* We are called to do stuff after the inferior stops.  */