x86, um: get rid of uml highmem.h
authorAl Viro <viro@zeniv.linux.org.uk>
Mon, 18 Aug 2008 08:15:12 +0000 (04:15 -0400)
committerH. Peter Anvin <hpa@zytor.com>
Thu, 23 Oct 2008 05:55:21 +0000 (22:55 -0700)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
arch/um/include/asm/archparam-i386.h
arch/um/include/asm/fixmap.h
arch/um/include/asm/highmem.h [deleted file]
arch/um/include/asm/pgtable.h

Simple merge
Simple merge
diff --cc arch/um/include/asm/highmem.h
Simple merge
Simple merge