git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
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
806aae3
..
06707a6
100644
(file)
--- a/
include/asm-i386/kmap_types.h
+++ b/
include/asm-i386/kmap_types.h
@@
-22,7
+22,12
@@
D(9) KM_IRQ0,
D(10) KM_IRQ1,
D(11) KM_SOFTIRQ0,
D(12) KM_SOFTIRQ1,
+#ifdef CONFIG_XEN
+D(13) KM_SWIOTLB,
+D(14) KM_TYPE_NR
+#else
D(13) KM_TYPE_NR
+#endif
};
#undef D