diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 61bfa32c64..db617059c7 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-19  Theodore A. Roth  <troth@openavr.org>
+
+	* avr-tdep.c (avr_frame_address): Delete function.
+	(avr_gdbarch_init): Don't call set_gdbarch_frame_args_address,
+	set_gdbarch_frame_args_address.
+
 2003-06-19  Andrew Cagney  <cagney@redhat.com>
 
 	* config/mips/tm-mips.h (REGISTER_CONVERT_TO_TYPE): Delete.
diff --git a/gdb/avr-tdep.c b/gdb/avr-tdep.c
index a0f59c607d..aeb901f311 100644
--- a/gdb/avr-tdep.c
+++ b/gdb/avr-tdep.c
@@ -817,12 +817,6 @@ avr_skip_prologue (CORE_ADDR pc)
   return prologue_end;
 }
 
-static CORE_ADDR
-avr_frame_address (struct frame_info *fi)
-{
-  return avr_make_saddr (get_frame_base (fi));
-}
-
 /* Not all avr devices support the BREAK insn. Those that don't should treat
    it as a NOP. Thus, it should be ok. Since the avr is currently a remote
    only target, this shouldn't be a problem (I hope). TRoth/2003-05-14  */
@@ -1362,8 +1356,6 @@ avr_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
   set_gdbarch_frame_args_skip (gdbarch, 0);
   set_gdbarch_frameless_function_invocation (gdbarch,
                                              frameless_look_for_prologue);
-  set_gdbarch_frame_args_address (gdbarch, avr_frame_address);
-  set_gdbarch_frame_locals_address (gdbarch, avr_frame_address);
 
   frame_unwind_append_predicate (gdbarch, avr_frame_p);
   frame_base_set_default (gdbarch, &avr_frame_base);