From c4614b8f58861d61ef2653a1d915abb4b1d2241e Mon Sep 17 00:00:00 2001
From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Mon, 1 Dec 2008 23:01:19 +0000
Subject: [PATCH] --- yaml --- r: 123648 b: refs/heads/master c:
 d281bc9d8a22419abc254f86a7fc268bb99914e1 h: refs/heads/master v: v3

---
 [refs]                                           | 2 +-
 trunk/arch/arm/mach-iop33x/include/mach/system.h | 1 +
 trunk/drivers/net/irda/sa1100_ir.c               | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ac7e22ab1c95..7e2834e4cf41 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 657e1de8e742cf81153d2d15545948bd58294200
+refs/heads/master: d281bc9d8a22419abc254f86a7fc268bb99914e1
diff --git a/trunk/arch/arm/mach-iop33x/include/mach/system.h b/trunk/arch/arm/mach-iop33x/include/mach/system.h
index 7bf3bfb49446..0cb3ad862acd 100644
--- a/trunk/arch/arm/mach-iop33x/include/mach/system.h
+++ b/trunk/arch/arm/mach-iop33x/include/mach/system.h
@@ -7,6 +7,7 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
+#include <asm/hardware/iop3xx.h>
 
 static inline void arch_idle(void)
 {
diff --git a/trunk/drivers/net/irda/sa1100_ir.c b/trunk/drivers/net/irda/sa1100_ir.c
index a95188948de7..0813b5295f52 100644
--- a/trunk/drivers/net/irda/sa1100_ir.c
+++ b/trunk/drivers/net/irda/sa1100_ir.c
@@ -36,7 +36,7 @@
 #include <net/irda/irda_device.h>
 
 #include <asm/irq.h>
-#include <asm/dma.h>
+#include <mach/dma.h>
 #include <mach/hardware.h>
 #include <asm/mach/irda.h>