From e0ff912638f922f71b5623cfdb3aefcae6154b55 Mon Sep 17 00:00:00 2001 From: proski Date: Fri, 17 Apr 2009 16:08:24 +0000 Subject: [PATCH] 2009-04-17 Pavel Roskin * fs/i386/pc/pxe.c (grub_pxefs_dir): Fix function prototype to match struct grub_fs. --- ChangeLog | 3 +++ fs/i386/pc/pxe.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index e99fdd53b..5b568037c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2009-04-17 Pavel Roskin + * 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 e12ca18a5..f294b89fa 100644 --- 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; }