2009-04-17 Pavel Roskin <proski@gnu.org>

	* fs/i386/pc/pxe.c (grub_pxefs_dir): Fix function prototype to
	match struct grub_fs.

diff --git a/ChangeLog b/ChangeLog
index e99fdd53bad09dd76c751905693115a142164f52..5b568037ce9acd1c0c4da5cafe642efff75bd0fa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-04-17  Pavel Roskin  <proski@gnu.org>
 
+       * fs/i386/pc/pxe.c (grub_pxefs_dir): Fix function prototype to
+       match struct grub_fs.
+
        * disk/ata.c (grub_ata_pciinit): Use NESTED_FUNC_ATTR.
        * bus/usb/ohci.c (grub_ohci_pci_iter): Likewise.
        * bus/usb/uhci.c (grub_uhci_pci_iter): Likewise.

diff --git a/fs/i386/pc/pxe.c b/fs/i386/pc/pxe.c
index e12ca18a5e6d98e5ce66873b64a62d4c616352ec..f294b89fa48328e51279f2b8d0a635f11cf65779 100644 (file)
--- a/fs/i386/pc/pxe.c
+++ b/fs/i386/pc/pxe.c
@@ -107,9 +107,9 @@ static struct grub_disk_dev grub_pxe_dev =
   };
 
 static grub_err_t
-grub_pxefs_dir (grub_device_t device __attribute((unused)),
-                const char *path __attribute((unused)),
-                int (*hook) (const char *filename, int dir) __attribute((unused)))
+grub_pxefs_dir (grub_device_t device UNUSED, const char *path UNUSED,
+               int (*hook) (const char *filename,
+                            const struct grub_dirhook_info *info) UNUSED)
 {
   return GRUB_ERR_NONE;
 }