From d0462c73a06924066b31b78d56a8e1963c4bd9d3 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 30 Jan 2008 13:34:05 +0100
Subject: [PATCH] --- yaml --- r: 80509 b: refs/heads/master c:
 3cbd09e482ade50d212511d4693bd754d4d9dd55 h: refs/heads/master i:   80507:
 2c8fe5e15087b16ed66cf8d23ed2a3326d7dd75e v: v3

---
 [refs]                         |  2 +-
 trunk/arch/x86/mm/ioremap_32.c | 15 +++++++--------
 trunk/arch/x86/mm/ioremap_64.c | 13 ++++++-------
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index d6e2e4d3c353..e618a37787a2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 91eebf40b3cb5abd76e813e17dbc320ff2ea3295
+refs/heads/master: 3cbd09e482ade50d212511d4693bd754d4d9dd55
diff --git a/trunk/arch/x86/mm/ioremap_32.c b/trunk/arch/x86/mm/ioremap_32.c
index 30ff2586db1e..d43251c9c1c6 100644
--- a/trunk/arch/x86/mm/ioremap_32.c
+++ b/trunk/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/trunk/arch/x86/mm/ioremap_64.c b/trunk/arch/x86/mm/ioremap_64.c
index bd962cc636c5..8862a19f39c8 100644
--- a/trunk/arch/x86/mm/ioremap_64.c
+++ b/trunk/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)
 {