x86: unify include/asm/mman_32/64.h
authorThomas Gleixner <tglx@linutronix.de>
Mon, 15 Oct 2007 21:28:21 +0000 (23:28 +0200)
committerThomas Gleixner <tglx@inhelltoy.tec.linutronix.de>
Wed, 17 Oct 2007 18:26:15 +0000 (20:26 +0200)
Same file, except for the extra 64bit MAP_32BIT define, which does not hurt
for 32 bit compiles.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
include/asm-x86/Kbuild
include/asm-x86/mman.h
include/asm-x86/mman_32.h [deleted file]
include/asm-x86/mman_64.h [deleted file]

Simple merge
Simple merge
diff --cc include/asm-x86/mman_32.h
Simple merge
diff --cc include/asm-x86/mman_64.h
Simple merge