diff options
| author | Greg Ungerer | 2009-01-29 06:46:06 +0100 |
|---|---|---|
| committer | Greg Ungerer | 2009-03-24 06:17:41 +0100 |
| commit | 74870998bb8e5914016bed4396b28a468a2da5d3 (patch) | |
| tree | 668625cb36b6432317ee8df2c398d34d8eaa9546 /arch/m68k/include/asm/kmap_types.h | |
| parent | m68k: use the mc146818rtc.h for non-mmu setups as well. (diff) | |
| download | kernel-qcow2-linux-74870998bb8e5914016bed4396b28a468a2da5d3.tar.gz kernel-qcow2-linux-74870998bb8e5914016bed4396b28a468a2da5d3.tar.xz kernel-qcow2-linux-74870998bb8e5914016bed4396b28a468a2da5d3.zip | |
m68k: use mmu kmap_types.h for non-mmu setups as well
The mmu version of kmap_types.h is identical to the non-mmu one.
Revert to a single file.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/include/asm/kmap_types.h')
| -rw-r--r-- | arch/m68k/include/asm/kmap_types.h | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/arch/m68k/include/asm/kmap_types.h b/arch/m68k/include/asm/kmap_types.h index 045d9fd122a2..c843c63d3801 100644 --- a/arch/m68k/include/asm/kmap_types.h +++ b/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 */ |