diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 93f8dd6e0a..d704164519 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2000-09-29  Kevin Buettner  <kevinb@redhat.com>
+
+	* ppc-linux-nat.c (supply_gregset, fill_gregset): Change type
+	of first argument from gregset_t to gdb_gregset_t in order
+	to match declarations in gregset.h.
+	(supply_fpregset, fill_fpregset): Change type of first argument
+	from fpregset_t to gdb_fpregset_t in order to match declarations
+	in gregset.h.
+
 2000-09-29  Kevin Buettner  <kevinb@redhat.com>
 
 	* procfs.c (proc_iterate_over_mappings, proc_iterate_over_threads,
diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c
index 7388254aa4..d562eca6f6 100644
--- a/gdb/ppc-linux-nat.c
+++ b/gdb/ppc-linux-nat.c
@@ -58,7 +58,7 @@ ppc_register_u_addr (int ustart, int regnum)
 }
 
 void
-supply_gregset (gregset_t * gregsetp)
+supply_gregset (gdb_gregset_t *gregsetp)
 {
   int regi;
   register greg_t *regp = (greg_t *) gregsetp;
@@ -71,7 +71,7 @@ supply_gregset (gregset_t * gregsetp)
 }
 
 void
-fill_gregset (gregset_t *gregsetp, int regno)
+fill_gregset (gdb_gregset_t *gregsetp, int regno)
 {
   int regi;
   greg_t *regp = (greg_t *) gregsetp;
@@ -93,7 +93,7 @@ fill_gregset (gregset_t *gregsetp, int regno)
 }
 
 void
-supply_fpregset (fpregset_t * fpregsetp)
+supply_fpregset (gdb_fpregset_t * fpregsetp)
 {
   int regi;
   for (regi = 0; regi < 32; regi++)
@@ -108,7 +108,7 @@ supply_fpregset (fpregset_t * fpregsetp)
    them all. */
 
 void
-fill_fpregset (fpregset_t *fpregsetp, int regno)
+fill_fpregset (gdb_fpregset_t *fpregsetp, int regno)
 {
   int regi;
   char *to;