Index: disk/dmraid_nvidia.c
===================================================================
--- disk/dmraid_nvidia.c	(revision 1872)
+++ disk/dmraid_nvidia.c	(working copy)
@@ -93,7 +93,6 @@
 {
   grub_disk_addr_t sector;
   struct grub_nv_super sb;
-  grub_uint32_t *uuid;
 
   if (disk->partition)
     return grub_error (GRUB_ERR_OUT_OF_RANGE, "skip partition");
Index: commands/i386/pc/pxecmd.c
===================================================================
--- commands/i386/pc/pxecmd.c	(revision 1872)
+++ commands/i386/pc/pxecmd.c	(working copy)
@@ -46,7 +46,8 @@
 }
 
 static grub_err_t
-grub_cmd_pxe (struct grub_arg_list *state, int argc, char **args)
+grub_cmd_pxe (struct grub_arg_list *state, int argc __attribute__ ((unused)),
+	      char **args __attribute__ ((unused)))
 {
   if (! grub_pxe_pxenv)
     return grub_error (GRUB_ERR_FILE_NOT_FOUND, "no pxe environment");