Define FLOPPY_MAJOR on NetBSD.

diff --git a/ChangeLog b/ChangeLog
index 1785473599a9653ab6fd084311fa2b19be1b56f7..63f497c396fd2df97f19551fbcc360038b972d55 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-22  Grégoire Sutre  <gregoire.sutre@gmail.com>
+
+       * grub-core/kern/emu/hostdisk.c [__NetBSD__]: Define FLOPPY_MAJOR.
+
 2010-09-22  Colin Watson  <cjwatson@ubuntu.com>
 
        * grub-core/loader/multiboot_mbi2.c (grub_multiboot_make_mbi): Fix

diff --git a/grub-core/kern/emu/hostdisk.c b/grub-core/kern/emu/hostdisk.c
index d38208fdc232be580ddad6d7155962d19531e81a..19d3856a204d65051d3f87d1c2f6376b4be14996 100644 (file)
--- a/grub-core/kern/emu/hostdisk.c
+++ b/grub-core/kern/emu/hostdisk.c
@@ -115,6 +115,9 @@ struct hd_geometry
 #  include <util.h>    /* getrawpartition */
 # endif /* HAVE_GETRAWPARTITION */
 # include <sys/fdio.h>
+# ifndef FLOPPY_MAJOR
+#  define FLOPPY_MAJOR 2
+# endif /* ! FLOPPY_MAJOR */
 # ifndef RAW_FLOPPY_MAJOR
 #  define RAW_FLOPPY_MAJOR     9
 # endif /* ! RAW_FLOPPY_MAJOR */