diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7dc0b6acc2..c5479557d8 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-19  Mark Kettenis  <kettenis@gnu.org>
+
+	* remote-sim.c (gdbsim_xfer_inferior_memory): Remove prototype.
+	Change type of second argument to`gdb_byte *'.
+
 2005-06-19  Nick Roberts  <nickrob@snap.net.nz>
 
 	* mi/mi-cmd-stack.c (mi_cmd_stack_info_frame): New function.
diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c
index 802c0b0ed1..6341b3c07f 100644
--- a/gdb/remote-sim.c
+++ b/gdb/remote-sim.c
@@ -1,7 +1,7 @@
 /* Generic remote debugging interface for simulators.
 
    Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-   2002, 2004 Free Software Foundation, Inc.
+   2002, 2004, 2005 Free Software Foundation, Inc.
 
    Contributed by Cygnus Support.
    Steve Chamberlain (sac@cygnus.com).
@@ -93,11 +93,6 @@ static ptid_t gdbsim_wait (ptid_t ptid, struct target_waitstatus *status);
 
 static void gdbsim_prepare_to_store (void);
 
-static int gdbsim_xfer_inferior_memory (CORE_ADDR memaddr, char *myaddr, 
-					int len, int write,
-					struct mem_attrib *attrib,
-					struct target_ops *target);
-
 static void gdbsim_files_info (struct target_ops *target);
 
 static void gdbsim_mourn_inferior (void);
@@ -742,7 +737,7 @@ gdbsim_prepare_to_store (void)
    Returns the number of bytes transferred. */
 
 static int
-gdbsim_xfer_inferior_memory (CORE_ADDR memaddr, char *myaddr, int len,
+gdbsim_xfer_inferior_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len,
 			     int write, struct mem_attrib *attrib,
 			     struct target_ops *target)
 {