From: robertmh <robertmh@localhost>
Date: Sat, 4 Jul 2009 16:29:01 +0000 (+0000)
Subject: 2009-07-04  Robert Millan  <rmh.grub@aybabtu.com>
X-Git-Tag: 1.98~731
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2da922955011aed47033f62f13f823883743d362;p=thirdparty%2Fgrub.git

2009-07-04  Robert Millan  <rmh.grub@aybabtu.com>

        * include/grub/i386/linux.h (struct linux_kernel_params): Add
        `capabilities' member.
---

diff --git a/ChangeLog b/ChangeLog
index 60ca2d8ee..b7fb17535 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-04  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* include/grub/i386/linux.h (struct linux_kernel_params): Add
+	`capabilities' member.
+
 2009-07-02  Pavel Roskin  <proski@gnu.org>
 
 	* genparttoollist.sh: Add missing newline at the end.
diff --git a/include/grub/i386/linux.h b/include/grub/i386/linux.h
index cf110973e..cee46c63d 100644
--- a/include/grub/i386/linux.h
+++ b/include/grub/i386/linux.h
@@ -174,8 +174,7 @@ struct linux_kernel_params
   grub_uint16_t vesapm_offset;		/* 30 */
   grub_uint16_t lfb_pages;		/* 32 */
   grub_uint16_t vesa_attrib;		/* 34 */
-
-  grub_uint8_t padding3[0x40 - 0x36];
+  grub_uint32_t capabilities;		/* 36 */
 
   grub_uint16_t apm_version;		/* 40 */
   grub_uint16_t apm_code_segment;	/* 42 */