Merge branch 'fix/asoc' into for-linus

[mv-sheeva.git] / include / asm-generic / kmap_types.h

diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
index e5f234a08540a86763a03806e6f1ca77764c822c..0232ccb76f2b18d86b15992c3c6afa45c83a3340 100644 (file)
--- a/include/asm-generic/kmap_types.h
+++ b/include/asm-generic/kmap_types.h
@@ -28,7 +28,11 @@ KMAP_D(15)   KM_UML_USERCOPY,
 KMAP_D(16)     KM_IRQ_PTE,
 KMAP_D(17)     KM_NMI,
 KMAP_D(18)     KM_NMI_PTE,
-KMAP_D(19)     KM_TYPE_NR
+KMAP_D(19)     KM_KDB,
+/*
+ * Remember to update debug_kmap_atomic() when adding new kmap types!
+ */
+KMAP_D(20)     KM_TYPE_NR
 };
 
 #undef KMAP_D