diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a61d050c00..743c08885f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,7 @@
 2004-09-18  Mark Kettenis  <kettenis@gnu.org>
 
+	* i386-tdep.c (i386_register_name): Rename regno to regnum.
+
 	* config/pa/hpux1020.mh (MH_CFLAGS): Remove -D__HP_CURSES.
 	* config/pa/hpux11.mh (MH_CFLAGS): Likewise.
 	* config/pa/hpux11w.mh (MH_CFLAGS): Likewise.
diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index cc727c81d9..d5cd111c90 100644
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -151,16 +151,16 @@ i386_fpc_regnum_p (int regnum)
   return (I387_FCTRL_REGNUM <= regnum && regnum < I387_XMM0_REGNUM);
 }
 
-/* Return the name of register REG.  */
+/* Return the name of register REGNUM.  */
 
 const char *
-i386_register_name (int reg)
+i386_register_name (int regnum)
 {
-  if (i386_mmx_regnum_p (current_gdbarch, reg))
-    return i386_mmx_names[reg - I387_MM0_REGNUM];
+  if (i386_mmx_regnum_p (current_gdbarch, regnum))
+    return i386_mmx_names[regnum - I387_MM0_REGNUM];
 
-  if (reg >= 0 && reg < i386_num_register_names)
-    return i386_register_names[reg];
+  if (regnum >= 0 && regnum < i386_num_register_names)
+    return i386_register_names[regnum];
 
   return NULL;
 }