diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b3063d8d8e6..05050e2ba6b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,4 +1,10 @@
+2002-06-19  Andrew Cagney  <cagney@redhat.com>
+
+	* i386-linux-tdep.c (i386_linux_register_name): Make return type
+	constant.
+
 2002-06-18  Joel Brobecker  <brobecker@gnat.com>
+
 	* alpha-tdep.c (heuristic_proc_desc): Compute the size of the  
 	current frame using only the first stack size adjustment. All
 	subsequent size adjustments are not considered to be part of
diff --git a/gdb/i386-linux-tdep.c b/gdb/i386-linux-tdep.c
index 12a2ab9004d..8fa9261e3c3 100644
--- a/gdb/i386-linux-tdep.c
+++ b/gdb/i386-linux-tdep.c
@@ -38,7 +38,7 @@
 
 /* Return the name of register REG.  */
 
-static char *
+static const char *
 i386_linux_register_name (int reg)
 {
   /* Deal with the extra "orig_eax" pseudo register.  */