diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2008-01-30 13:34:05 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:34:05 +0100 |
| commit | 3cbd09e482ade50d212511d4693bd754d4d9dd55 (patch) | |
| tree | 6827d179390beb9cf792a5049df6c2905bf182fe | |
| parent | 91eebf40b3cb5abd76e813e17dbc320ff2ea3295 (diff) | |
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>
| -rw-r--r-- | arch/x86/mm/ioremap_32.c | 15 | ||||
| -rw-r--r-- | arch/x86/mm/ioremap_64.c | 13 |
2 files changed, 13 insertions, 15 deletions
diff --git a/arch/x86/mm/ioremap_32.c b/arch/x86/mm/ioremap_32.c index 30ff2586db1..d43251c9c1c 100644 --- a/arch/x86/mm/ioremap_32.c +++ b/arch/x86/mm/ioremap_32.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 <asm/fixmap.h> +#include <linux/module.h> +#include <linux/slab.h> +#include <linux/vmalloc.h> + #include <asm/cacheflush.h> -#include <asm/tlbflush.h> +#include <asm/e820.h> +#include <asm/fixmap.h> #include <asm/pgtable.h> - -#define ISA_START_ADDRESS 0xa0000 -#define ISA_END_ADDRESS 0x100000 +#include <asm/tlbflush.h> /* * Remap an arbitrary physical address space into the kernel virtual diff --git a/arch/x86/mm/ioremap_64.c b/arch/x86/mm/ioremap_64.c index bd962cc636c..8862a19f39c 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) { |