diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 56d1d5c7b3..02845f159b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-24  Thiago Jung Bauermann  <bauerman@br.ibm.com>
+
+	* breakpont.c (remove_hw_watchpoints): Remove unused function.
+	* breakpoint.h remove_hw_watchpoints(): Remove prototype.
+
 2011-05-23  Tom Tromey  <tromey@redhat.com>
 
 	* c-lang.c (evaluate_subexp_c): Use expect_type if it is not
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 70931045b3..c1e00136bb 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -2015,20 +2015,6 @@ remove_breakpoints_pid (int pid)
   return 0;
 }
 
-int
-remove_hw_watchpoints (void)
-{
-  struct bp_location *bl, **blp_tmp;
-  int val = 0;
-
-  ALL_BP_LOCATIONS (bl, blp_tmp)
-  {
-    if (bl->inserted && bl->loc_type == bp_loc_hardware_watchpoint)
-      val |= remove_breakpoint (bl, mark_uninserted);
-  }
-  return val;
-}
-
 int
 reattach_breakpoints (int pid)
 {
diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h
index 7fa705fa2f..0cbd9dd788 100644
--- a/gdb/breakpoint.h
+++ b/gdb/breakpoint.h
@@ -1151,10 +1151,6 @@ extern int ep_is_catchpoint (struct breakpoint *);
    deletes all breakpoints.  */
 extern void delete_command (char *arg, int from_tty);
 
-/* Pull all H/W watchpoints from the target.  Return non-zero if the
-   remove fails.  */
-extern int remove_hw_watchpoints (void);
-
 /* Manage a software single step breakpoint (or two).  Insert may be
    called twice before remove is called.  */
 extern void insert_single_step_breakpoint (struct gdbarch *,