diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog
index e5f64fe0b6..05e71247e9 100644
--- a/c/src/lib/libcpu/powerpc/ChangeLog
+++ b/c/src/lib/libcpu/powerpc/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-30	Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+	* mpc55xx/edma/edma.c: Use rtems_chain_first() and do not directly
+	access the structure.
+
 2010-11-12	Sebastian Huber <sebastian.huber@embedded-brains.de>
 
 	* mpc55xx/include/irq.h: Include missing <bspopts.h>.  Format.
diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/edma/edma.c b/c/src/lib/libcpu/powerpc/mpc55xx/edma/edma.c
index 4026fca522..0c9464cd32 100644
--- a/c/src/lib/libcpu/powerpc/mpc55xx/edma/edma.c
+++ b/c/src/lib/libcpu/powerpc/mpc55xx/edma/edma.c
@@ -69,7 +69,7 @@ static void mpc55xx_edma_interrupt_handler( void *arg)
 static void mpc55xx_edma_interrupt_error_handler( void *arg)
 {
 	rtems_chain_control *chain = &mpc55xx_edma_channel_chain;
-	rtems_chain_node *node = chain->first;
+	rtems_chain_node *node = rtems_chain_first( chain );
 	unsigned i = 0;
 	uint64_t error_status = EDMA.ESR.R;
 	uint64_t error_channels = ((uint64_t) EDMA.ERH.R << 32) | EDMA.ERL.R;