Commit 0a1e1222 authored by Jon Loeliger's avatar Jon Loeliger Committed by Paul Mackerras
Browse files

[PATCH] powerpc: Merge kmap_types.h 



Here is a patch to merge the ppc and pp64 version of kmap_types.h

Signed-off-by: default avatarJon Loeliger <jdl@freescale.com>
Signed-off-by: default avatarKumar Gala <kumar.gala@freescale.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 628f87f3

include/asm-ppc/kmap_types.h→include/asm-powerpc/kmap_types.h

+33 −0
Original line number Diff line number Diff line 
#ifndef _ASM_POWERPC_KMAP_TYPES_H

#define _ASM_POWERPC_KMAP_TYPES_H



#ifdef __KERNEL__

#ifndef _ASM_KMAP_TYPES_H

#define _ASM_KMAP_TYPES_H



/*

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * as published by the Free Software Foundation; either version

 * 2 of the License, or (at your option) any later version.

 */



enum km_type {

	KM_BOUNCE_READ,
@@ -21,5 +29,5 @@ enum km_type { 
	KM_TYPE_NR

};



#endif

#endif	/* __KERNEL__ */

#endif	/* _ASM_POWERPC_KMAP_TYPES_H */

include/asm-ppc64/kmap_types.h

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
#ifdef __KERNEL__

#ifndef _ASM_KMAP_TYPES_H

#define _ASM_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

#endif /* __KERNEL__ */