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

--- head-2010-03-24.orig/arch/x86/include/mach-xen/asm/hypervisor.h	2010-03-25 16:41:12.000000000 +0100
+++ head-2010-03-24/arch/x86/include/mach-xen/asm/hypervisor.h	2009-11-23 10:45:08.000000000 +0100
@@ -354,4 +354,9 @@ MULTI_grant_table_op(multicall_entry_t *
 
 #define uvm_multi(cpumask) ((unsigned long)cpumask_bits(cpumask) | UVMF_MULTI)
 
+#ifdef LINUX
+/* drivers/staging/ use Windows-style types, including VOID */
+#undef VOID
+#endif
+
 #endif /* __HYPERVISOR_H__ */
--- head-2010-03-24.orig/drivers/staging/vt6655/ttype.h	2010-03-25 16:41:12.000000000 +0100
+++ head-2010-03-24/drivers/staging/vt6655/ttype.h	2009-10-13 17:02:12.000000000 +0200
@@ -30,6 +30,9 @@
 #ifndef __TTYPE_H__
 #define __TTYPE_H__
 
+#ifdef CONFIG_XEN
+#include <asm/hypervisor.h>
+#endif
 
 /******* Common definitions and typedefs ***********************************/
 
--- head-2010-03-24.orig/drivers/staging/vt6656/ttype.h	2010-03-25 16:41:12.000000000 +0100
+++ head-2010-03-24/drivers/staging/vt6656/ttype.h	2009-10-13 17:02:12.000000000 +0200
@@ -30,6 +30,9 @@
 #ifndef __TTYPE_H__
 #define __TTYPE_H__
 
+#ifdef CONFIG_XEN
+#include <asm/hypervisor.h>
+#endif
 
 /******* Common definitions and typedefs ***********************************/