Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1

[linux-2.6.git] / include / asm-i386 / kmap_types.h

diff --git a/include/asm-i386/kmap_types.h b/include/asm-i386/kmap_types.h
index b4a2db0..06707a6 100644 (file)
--- a/include/asm-i386/kmap_types.h
+++ b/include/asm-i386/kmap_types.h
@@ -1,7 +1,6 @@
 #ifndef _ASM_KMAP_TYPES_H
 #define _ASM_KMAP_TYPES_H
 
-#include <linux/config.h>
 
 #ifdef CONFIG_DEBUG_HIGHMEM
 # define D(n) __KM_FENCE_##n ,
@@ -23,9 +22,12 @@ D(9) KM_IRQ0,
 D(10)  KM_IRQ1,
 D(11)  KM_SOFTIRQ0,
 D(12)  KM_SOFTIRQ1,
-D(13)  KM_CRASHDUMP,
-D(14)  KM_UNUSED,
-D(15)  KM_TYPE_NR
+#ifdef CONFIG_XEN
+D(13)  KM_SWIOTLB,
+D(14)  KM_TYPE_NR
+#else
+D(13)  KM_TYPE_NR
+#endif
 };
 
 #undef D