---

yaml --- r: 139958 b: refs/heads/master c: 7487099 h: refs/heads/master v: v3
git-mirror · Mar 24, 2009 · ea45302 · ea45302
1 parent 28f5d89
commit ea45302
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 48 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf08d5251840ee7fe7ac561fc65aeead4f31335b
+refs/heads/master: 74870998bb8e5914016bed4396b28a468a2da5d3
diff --git a/trunk/arch/m68k/include/asm/kmap_types.h b/trunk/arch/m68k/include/asm/kmap_types.h
@@ -1,5 +1,21 @@
-#ifdef __uClinux__
-#include "kmap_types_no.h"
-#else
-#include "kmap_types_mm.h"
-#endif
+#ifndef __ASM_M68K_KMAP_TYPES_H
+#define __ASM_M68K_KMAP_TYPES_H
+
+enum km_type {
+	KM_BOUNCE_READ,
+	KM_SKB_SUNRPC_DATA,
+	KM_SKB_DATA_SOFTIRQ,
+	KM_USER0,
+	KM_USER1,
+	KM_BIO_SRC_IRQ,
+	KM_BIO_DST_IRQ,
+	KM_PTE0,
+	KM_PTE1,
+	KM_IRQ0,
+	KM_IRQ1,
+	KM_SOFTIRQ0,
+	KM_SOFTIRQ1,
+	KM_TYPE_NR
+};
+
+#endif	/* __ASM_M68K_KMAP_TYPES_H */
diff --git a/trunk/arch/m68k/include/asm/kmap_types_mm.h b/trunk/arch/m68k/include/asm/kmap_types_mm.h
diff --git a/trunk/arch/m68k/include/asm/kmap_types_no.h b/trunk/arch/m68k/include/asm/kmap_types_no.h