2009-08-28 Colin Watson <cjwatson@ubuntu.com>

	* term/i386/pc/console.c (bios_data_area): Cast
	GRUB_MEMORY_MACHINE_BIOS_DATA_AREA_ADDR explicitly.

diff --git a/ChangeLog b/ChangeLog
index b43aa72ba02e2e09f99bf71a57dae5218bd98068..1858a9cbb5c6acb31efa18bbf45bec35c26da041 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-28  Colin Watson  <cjwatson@ubuntu.com>
+
+       * term/i386/pc/console.c (bios_data_area): Cast
+       GRUB_MEMORY_MACHINE_BIOS_DATA_AREA_ADDR explicitly.
+
 2009-08-28  Vladimir Serbinenko  <phcoder@gmail.com>
 
        1-bit optimised blitters.

diff --git a/term/i386/pc/console.c b/term/i386/pc/console.c
index ec138394222dcc533e8631b7f7ca56f49d9174e3..66475d456ec0ef453d62b75d50584fbdeb81f4c2 100644 (file)
--- a/term/i386/pc/console.c
+++ b/term/i386/pc/console.c
@@ -21,7 +21,8 @@
 #include <grub/term.h>
 #include <grub/types.h>
 
-static const struct grub_machine_bios_data_area *bios_data_area = GRUB_MEMORY_MACHINE_BIOS_DATA_AREA_ADDR;
+static const struct grub_machine_bios_data_area *bios_data_area =
+  (struct grub_machine_bios_data_area *) GRUB_MEMORY_MACHINE_BIOS_DATA_AREA_ADDR;
 
 #define KEYBOARD_LEFT_SHIFT    (1 << 0)
 #define KEYBOARD_RIGHT_SHIFT   (1 << 1)