[people/pmueller/ipfire-2.x.git] / src / patches / 60051_xen-rt2860-build.patch1

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

Index: head-2008-11-17/include/asm-x86/mach-xen/asm/hypervisor.h
===================================================================
--- head-2008-11-17.orig/include/asm-x86/mach-xen/asm/hypervisor.h	2008-11-17 14:06:21.000000000 +0100
+++ head-2008-11-17/include/asm-x86/mach-xen/asm/hypervisor.h	2008-11-18 14:12:19.000000000 +0100
@@ -340,4 +340,9 @@ MULTI_grant_table_op(multicall_entry_t *
 
 #endif
 
+#ifdef LINUX
+/* drivers/staging/rt2860/ uses Windows-style types, including VOID */
+#undef VOID
+#endif
+
 #endif /* __HYPERVISOR_H__ */
Commit	Line	Data
cc90b958 BS	1	From: jbeulich@novell.com
	2	Subject: fix issue with Windows-style types used in rt2680
	3	Patch-mainline: obsolete
	4
	5	Index: head-2008-11-17/include/asm-x86/mach-xen/asm/hypervisor.h
	6	===================================================================
	7	--- head-2008-11-17.orig/include/asm-x86/mach-xen/asm/hypervisor.h 2008-11-17 14:06:21.000000000 +0100
	8	+++ head-2008-11-17/include/asm-x86/mach-xen/asm/hypervisor.h 2008-11-18 14:12:19.000000000 +0100
	9	@@ -340,4 +340,9 @@ MULTI_grant_table_op(multicall_entry_t *
	10
	11	#endif
	12
	13	+#ifdef LINUX
	14	+/* drivers/staging/rt2860/ uses Windows-style types, including VOID */
	15	+#undef VOID
	16	+#endif
	17	+
	18	#endif /* __HYPERVISOR_H__ */