Fix compilation on GNU/Linux.

* grub-core/kern/emu/getroot.c (grub_util_pull_device) [!FreeBSD]:
	Disable geli.
	(grub_util_get_grub_dev) [!FreeBSD]: Likewise.
	(grub_util_pull_device) [HAVE_DEVICE_MAPPER]: Fix const and func name.
	* grub-core/disk/cryptodisk.c (grub_cryptodisk_open): Fix proto.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-07-08 03:59:05 +02:00
parent a251b71915
commit cd8fe79a59
3 changed files with 17 additions and 5 deletions

View file

@ -413,8 +413,7 @@ grub_cryptodisk_iterate (int (*hook) (const char *name),
}
static grub_err_t
grub_cryptodisk_open (const char *name, grub_disk_t disk,
grub_disk_pull_t pull __attribute__ ((unused)))
grub_cryptodisk_open (const char *name, grub_disk_t disk)
{
grub_cryptodisk_t dev;