From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 22 Oct 2010 21:27:33 +0000 (+0200)
Subject: 	* doc/multiboot.h (multiboot_apm_info): Use multiboot and not GRUB
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f416453ad672e89b9a6b89885cb6c9f73584becf;p=thirdparty%2Fgrub.git

	* doc/multiboot.h (multiboot_apm_info): Use multiboot and not GRUB
	integer types.
---

diff --git a/ChangeLog b/ChangeLog
index b0bd22e87..9f14b7f65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-22  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* doc/multiboot.h (multiboot_apm_info): Use multiboot and not GRUB
+	integer types.
+
 2010-09-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* doc/multiboot.h: Stylistic improvements. Add APM declarations.
diff --git a/doc/multiboot.h b/doc/multiboot.h
index bd133ba1f..1ba51c40c 100644
--- a/doc/multiboot.h
+++ b/doc/multiboot.h
@@ -258,15 +258,15 @@ typedef struct multiboot_mod_list multiboot_module_t;
 /* APM BIOS info.  */
 struct multiboot_apm_info
 {
-  grub_uint16_t version;
-  grub_uint16_t cseg;
-  grub_uint32_t offset;
-  grub_uint16_t cseg_16;
-  grub_uint16_t dseg;
-  grub_uint16_t flags;
-  grub_uint16_t cseg_len;
-  grub_uint16_t cseg_16_len;
-  grub_uint16_t dseg_len;
+  multiboot_uint16_t version;
+  multiboot_uint16_t cseg;
+  multiboot_uint32_t offset;
+  multiboot_uint16_t cseg_16;
+  multiboot_uint16_t dseg;
+  multiboot_uint16_t flags;
+  multiboot_uint16_t cseg_len;
+  multiboot_uint16_t cseg_16_len;
+  multiboot_uint16_t dseg_len;
 };
 
 #endif /* ! ASM_FILE */