Commit 74870998 authored by Greg Ungerer's avatar Greg Ungerer
Browse files

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: default avatarGreg Ungerer <gerg@uclinux.org>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent bf08d525

arch/m68k/include/asm/kmap_types.h

+21 −5
Original line number Diff line number Diff line 
#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 */

arch/m68k/include/asm/kmap_types_mm.h

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
#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 */

arch/m68k/include/asm/kmap_types_no.h

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
#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