diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 65d056bcb3e..7dba15deea6 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2015-10-22  Simon Marchi  <simon.marchi@ericsson.com>
+
+	* nto-tdep.c (nto_inferior_data): Add cast.
+
 2015-10-22  Pedro Alves  <palves@redhat.com>
 
 	* windows-nat.c (do_initial_windows_stuff): Rewrite loop using
diff --git a/gdb/nto-tdep.c b/gdb/nto-tdep.c
index fdf6c81028e..c2b8e436d7c 100644
--- a/gdb/nto-tdep.c
+++ b/gdb/nto-tdep.c
@@ -552,7 +552,8 @@ nto_inferior_data (struct inferior *const inferior)
 
   gdb_assert (inf != NULL);
 
-  inf_data = inferior_data (inf, nto_inferior_data_reg);
+  inf_data
+    = (struct nto_inferior_data *) inferior_data (inf, nto_inferior_data_reg);
   if (inf_data == NULL)
     {
       set_inferior_data (inf, nto_inferior_data_reg,