From: jbeulich@novell.com
Subject: fix issue with Windows-style types used in drivers/staging/
Patch-mainline: obsolete

--- head-2009-07-28.orig/arch/x86/include/mach-xen/asm/hypervisor.h	2009-07-28 12:32:07.000000000 +0200
+++ head-2009-07-28/arch/x86/include/mach-xen/asm/hypervisor.h	2009-07-13 15:19:18.000000000 +0200
@@ -351,4 +351,9 @@ MULTI_grant_table_op(multicall_entry_t *
 
 #define uvm_multi(cpumask) ((unsigned long)cpus_addr(cpumask) | UVMF_MULTI)
 
+#ifdef LINUX
+/* drivers/staging/ use Windows-style types, including VOID */
+#undef VOID
+#endif
+
 #endif /* __HYPERVISOR_H__ */
--- head-2009-07-28.orig/drivers/staging/vt6655/ttype.h	2009-07-28 09:55:49.000000000 +0200
+++ head-2009-07-28/drivers/staging/vt6655/ttype.h	2009-07-31 13:59:52.000000000 +0200
@@ -27,6 +27,9 @@
 #ifndef __TTYPE_H__
 #define __TTYPE_H__
 
+#ifdef CONFIG_XEN
+#include <asm/hypervisor.h>
+#endif
 
 /******* Common definitions and typedefs ***********************************/
 
