Index: 2005-12-16/include/asm-i386/kmap_types.h
===================================================================
--- 2005-12-16.orig/include/asm-i386/kmap_types.h	2005-11-21 16:42:07.000000000 +0100
+++ 2005-12-16/include/asm-i386/kmap_types.h	2005-12-20 16:23:25.717793952 +0100
@@ -23,7 +23,8 @@ D(9)	KM_IRQ0,
 D(10)	KM_IRQ1,
 D(11)	KM_SOFTIRQ0,
 D(12)	KM_SOFTIRQ1,
-D(13)	KM_TYPE_NR
+D(13)	KM_SWIOTLB,
+D(14)	KM_TYPE_NR
 };
 
 #undef D
Index: 2005-12-16/include/asm-i386/mach-xen/asm/kmap_types.h
===================================================================
--- 2005-12-16.orig/include/asm-i386/mach-xen/asm/kmap_types.h	2005-11-21 16:42:07.000000000 +0100
+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-#ifndef _ASM_KMAP_TYPES_H
-#define _ASM_KMAP_TYPES_H
-
-#include <linux/config.h>
-
-#ifdef CONFIG_DEBUG_HIGHMEM
-# define D(n) __KM_FENCE_##n ,
-#else
-# define D(n)
-#endif
-
-enum km_type {
-D(0)	KM_BOUNCE_READ,
-D(1)	KM_SKB_SUNRPC_DATA,
-D(2)	KM_SKB_DATA_SOFTIRQ,
-D(3)	KM_USER0,
-D(4)	KM_USER1,
-D(5)	KM_BIO_SRC_IRQ,
-D(6)	KM_BIO_DST_IRQ,
-D(7)	KM_PTE0,
-D(8)	KM_PTE1,
-D(9)	KM_IRQ0,
-D(10)	KM_IRQ1,
-D(11)	KM_SOFTIRQ0,
-D(12)	KM_SOFTIRQ1,
-D(13)	KM_SWIOTLB,
-D(14)	KM_TYPE_NR
-};
-
-#undef D
-
-#endif