diff --git a/ChangeLog b/ChangeLog
index ee79af72b..4bedee201 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-08  Hollis Blanchard  <hollis@penguinppc.org>
+
+	* kern/powerpc/ieee1275/cmain.c (cmain): Mark r3 and r4 as `UNUSED'.
+
 2006-11-25  Yoshinori K. Okuji  <okuji@enbug.org>
 
 	* util/i386/pc/grub-mkimage.c (generate_image): Fix the offset of
diff --git a/kern/powerpc/ieee1275/cmain.c b/kern/powerpc/ieee1275/cmain.c
index d0127eef6..60f07000e 100644
--- a/kern/powerpc/ieee1275/cmain.c
+++ b/kern/powerpc/ieee1275/cmain.c
@@ -22,6 +22,7 @@
 #include <stdint.h>
 #include <grub/kernel.h>
 #include <grub/misc.h>
+#include <grub/types.h>
 #include <grub/machine/kernel.h>
 #include <grub/ieee1275/ieee1275.h>
 
@@ -67,7 +68,7 @@ grub_ieee1275_find_options (void)
 
 void cmain (uint32_t r3, uint32_t r4, uint32_t r5);
 void
-cmain (uint32_t r3, uint32_t r4 __attribute__((unused)), uint32_t r5)
+cmain (UNUSED uint32_t r3, UNUSED uint32_t r4, uint32_t r5)
 {
   grub_ieee1275_entry_fn = (int (*)(void *)) r5;