summaryrefslogtreecommitdiff
path: root/arch/x86/mm/ioremap_64.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-01-30 15:34:05 +0300
committerIngo Molnar <mingo@elte.hu>2008-01-30 15:34:05 +0300
commit3cbd09e482ade50d212511d4693bd754d4d9dd55 (patch)
tree6827d179390beb9cf792a5049df6c2905bf182fe /arch/x86/mm/ioremap_64.c
parent91eebf40b3cb5abd76e813e17dbc320ff2ea3295 (diff)
downloadlinux-3cbd09e482ade50d212511d4693bd754d4d9dd55.tar.xz
x86: cleanup ioremap includes
Get rid of the douplicate define of ISA_START/END_ADDRESS and use the same headers in 32 and 64 bit code. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/mm/ioremap_64.c')
-rw-r--r--arch/x86/mm/ioremap_64.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/arch/x86/mm/ioremap_64.c b/arch/x86/mm/ioremap_64.c
index bd962cc636c5..8862a19f39c8 100644
--- a/arch/x86/mm/ioremap_64.c
+++ b/arch/x86/mm/ioremap_64.c
@@ -6,18 +6,17 @@
* (C) Copyright 1995 1996 Linus Torvalds
*/
-#include <linux/vmalloc.h>
#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/module.h>
#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/vmalloc.h>
-#include <asm/pgalloc.h>
-#include <asm/fixmap.h>
-#include <asm/tlbflush.h>
#include <asm/cacheflush.h>
-#include <asm/proto.h>
#include <asm/e820.h>
+#include <asm/fixmap.h>
+#include <asm/pgtable.h>
+#include <asm/tlbflush.h>
unsigned long __phys_addr(unsigned long x)
{