bitkeeper revision 1.1558 (4294f9a2Vif6PUYZMV6j1GuP-Mn6Xg)

gcc4 build fixes.
Signed-off-by: Keir Fraser <keir@xensource.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/xen/arch/x86/dmi_scan.c b/xen/arch/x86/dmi_scan.c
index 06f8c15a96..1d42756dc1 100644
--- a/xen/arch/x86/dmi_scan.c
+++ b/xen/arch/x86/dmi_scan.c
@@ -9,7 +9,7 @@
 #include <asm/system.h>
 #include <xen/dmi.h>
 
-#define bt_ioremap(b,l)  __acpi_map_table(b,l)
+#define bt_ioremap(b,l)  ((u8 *)__acpi_map_table(b,l))
 #define bt_iounmap(b,l)  ((void)0)
 #define ioremap(b,l)     (__va(b))
 #define memcpy_fromio    memcpy
@@ -34,7 +34,7 @@ struct dmi_header
 
 static char * __init dmi_string(struct dmi_header *dm, u8 s)
 {
-	u8 *bp=(u8 *)dm;
+	char *bp=(char *)dm;
 	bp+=dm->length;
 	if(!s)
 		return "";