diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 4df473b0864..f362c342e3c 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,9 @@
+2013-09-06  Ricard Wanderlof  <ricardw@axis.com>
+
+	* linux-crisv32-low.c (elf_gregset_t): Delete typedef.
+	(initialize_low_arch): Call init_registers_crisv32 rather than
+	init_register_crisv32.
+
 2013-09-05  Pedro Alves  <palves@redhat.com>
 
 	* server.h (handle_vFile, hostio_last_error_from_errno): Move
diff --git a/gdb/gdbserver/linux-crisv32-low.c b/gdb/gdbserver/linux-crisv32-low.c
index efe50a76e53..2849d0252a7 100644
--- a/gdb/gdbserver/linux-crisv32-low.c
+++ b/gdb/gdbserver/linux-crisv32-low.c
@@ -369,8 +369,6 @@ cris_arch_setup (void)
   current_process ()->tdesc = tdesc_crisv32;
 }
 
-typedef unsigned long elf_gregset_t[cris_num_regs];
-
 static struct regset_info cris_regsets[] = {
   { PTRACE_GETREGS, PTRACE_SETREGS, 0, cris_num_regs * 4,
     GENERAL_REGS, cris_fill_gregset, cris_store_gregset },
@@ -426,7 +424,7 @@ struct linux_target_ops the_low_target = {
 void
 initialize_low_arch (void)
 {
-  init_register_crisv32 ();
+  init_registers_crisv32 ();
 
   initialize_regsets_info (&cris_regsets_info);
 }