From: proski Date: Mon, 6 Jul 2009 02:10:57 +0000 (+0000) Subject: 2009-07-05 Pavel Roskin X-Git-Tag: 1.98~728 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bab7495862f01aece16d88e70f0fc3e8fcfe6b24;p=thirdparty%2Fgrub.git 2009-07-05 Pavel Roskin * include/grub/i386/linux.h (struct linux_kernel_params): Restore padding3, it's still needed. --- diff --git a/ChangeLog b/ChangeLog index e72f8cd31..db77c5d6b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2009-07-05 Pavel Roskin + * include/grub/i386/linux.h (struct linux_kernel_params): + Restore padding3, it's still needed. + * util/grub.d/10_freebsd.in: Fix spelling of `device.hints' on FreeBSD. * util/osdetect.lua: Likewise. diff --git a/include/grub/i386/linux.h b/include/grub/i386/linux.h index cee46c63d..8a5a84da3 100644 --- a/include/grub/i386/linux.h +++ b/include/grub/i386/linux.h @@ -176,6 +176,8 @@ struct linux_kernel_params grub_uint16_t vesa_attrib; /* 34 */ grub_uint32_t capabilities; /* 36 */ + grub_uint8_t padding3[0x40 - 0x3a]; + grub_uint16_t apm_version; /* 40 */ grub_uint16_t apm_code_segment; /* 42 */ grub_uint32_t apm_entry; /* 44 */