diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0bcb4a166f..3db5070ee6 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-04  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* breakpoint.c (bpstat_find_step_resume_breakpoint): Remove.
+	* breakpoint.h (bpstat_find_step_resume_breakpoint): Remove.
+
 2010-04-02  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* dwarf2read.c (read_namespace_type): Use common "return set_die_type"
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 46a50b9fa1..c6f2e29dd2 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -2963,36 +2963,6 @@ bpstat_find_breakpoint (bpstat bsp, struct breakpoint *breakpoint)
   return NULL;
 }
 
-/* Find a step_resume breakpoint associated with this bpstat.
-   (If there are multiple step_resume bp's on the list, this function
-   will arbitrarily pick one.)
-
-   It is an error to use this function if BPSTAT doesn't contain a
-   step_resume breakpoint.
-
-   See wait_for_inferior's use of this function.  */
-struct breakpoint *
-bpstat_find_step_resume_breakpoint (bpstat bsp)
-{
-  int current_thread;
-
-  gdb_assert (bsp != NULL);
-
-  current_thread = pid_to_thread_id (inferior_ptid);
-
-  for (; bsp != NULL; bsp = bsp->next)
-    {
-      if ((bsp->breakpoint_at != NULL)
-	  && (bsp->breakpoint_at->owner->type == bp_step_resume)
-	  && (bsp->breakpoint_at->owner->thread == current_thread
-	      || bsp->breakpoint_at->owner->thread == -1))
-	return bsp->breakpoint_at->owner;
-    }
-
-  internal_error (__FILE__, __LINE__, _("No step_resume breakpoint found."));
-}
-
-
 /* Put in *NUM the breakpoint number of the first breakpoint we are stopped
    at.  *BSP upon return is a bpstat which points to the remaining
    breakpoints stopped at (but which is not guaranteed to be good for
diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h
index 3da6188a17..a17a9dd6ac 100644
--- a/gdb/breakpoint.h
+++ b/gdb/breakpoint.h
@@ -651,17 +651,6 @@ struct bpstat_what bpstat_what (bpstat);
 /* Find the bpstat associated with a breakpoint.  NULL otherwise. */
 bpstat bpstat_find_breakpoint (bpstat, struct breakpoint *);
 
-/* Find a step_resume breakpoint associated with this bpstat.
-   (If there are multiple step_resume bp's on the list, this function
-   will arbitrarily pick one.)
-
-   It is an error to use this function if BPSTAT doesn't contain a
-   step_resume breakpoint.
-
-   See wait_for_inferior's use of this function.
- */
-extern struct breakpoint *bpstat_find_step_resume_breakpoint (bpstat);
-
 /* Nonzero if a signal that we got in wait() was due to circumstances
    explained by the BS.  */
 /* Currently that is true if we have hit a breakpoint, or if there is