From cca56adb2d353b1cce16435f44ef96360681e127 Mon Sep 17 00:00:00 2001
From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Fri, 28 Nov 2008 21:12:40 +0000
Subject: [PATCH] --- yaml --- r: 123587 b: refs/heads/master c:
 4b78a9ffabbb03af4032ff704689912298e19070 h: refs/heads/master i:   123585:
 dff6753b25e5a6ae7ce6a73b032dcf49dd133b32   123583:
 ce04e3de2a23b81236c2b190cf54de8a27fa09c9 v: v3

---
 [refs]                                        | 2 +-
 trunk/arch/arm/mach-ixp4xx/include/mach/dma.h | 4 +---
 trunk/arch/arm/mach-ixp4xx/include/mach/io.h  | 2 --
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 820e2b42dc74..8c3edc0fbe95 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32643fe633ce1c9c892bceee35cd0d137d71bae5
+refs/heads/master: 4b78a9ffabbb03af4032ff704689912298e19070
diff --git a/trunk/arch/arm/mach-ixp4xx/include/mach/dma.h b/trunk/arch/arm/mach-ixp4xx/include/mach/dma.h
index 00c5070c0201..65944f252664 100644
--- a/trunk/arch/arm/mach-ixp4xx/include/mach/dma.h
+++ b/trunk/arch/arm/mach-ixp4xx/include/mach/dma.h
@@ -11,10 +11,8 @@
 #ifndef __ASM_ARCH_DMA_H
 #define __ASM_ARCH_DMA_H
 
-#include <linux/device.h>
-#include <asm/page.h>
+#include <asm/memory.h>
 #include <asm/sizes.h>
-#include <mach/hardware.h>
 
 #define MAX_DMA_ADDRESS		(PAGE_OFFSET + SZ_64M)
 
diff --git a/trunk/arch/arm/mach-ixp4xx/include/mach/io.h b/trunk/arch/arm/mach-ixp4xx/include/mach/io.h
index 319948e31bec..b7f780f574fa 100644
--- a/trunk/arch/arm/mach-ixp4xx/include/mach/io.h
+++ b/trunk/arch/arm/mach-ixp4xx/include/mach/io.h
@@ -49,8 +49,6 @@ extern int ixp4xx_pci_write(u32 addr, u32 cmd, u32 data);
 
 #else
 
-#include <linux/mm.h>
-
 /*
  * In the case of using indirect PCI, we simply return the actual PCI
  * address and our read/write implementation use that to drive the