summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King2008-12-02 00:01:19 +0100
committerRussell King2008-12-02 00:01:19 +0100
commitd281bc9d8a22419abc254f86a7fc268bb99914e1 (patch)
tree22f4219bc1c8f1540c80811b25f58b28ef431e9d
parentMerge branch 'for-rmk-realview' of git://linux-arm.org/linux-2.6 into devel (diff)
downloadkernel-qcow2-linux-d281bc9d8a22419abc254f86a7fc268bb99914e1.tar.gz
kernel-qcow2-linux-d281bc9d8a22419abc254f86a7fc268bb99914e1.tar.xz
kernel-qcow2-linux-d281bc9d8a22419abc254f86a7fc268bb99914e1.zip
[ARM] fix missing includes for iop33x and sa1100_ir
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mach-iop33x/include/mach/system.h1
-rw-r--r--drivers/net/irda/sa1100_ir.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-iop33x/include/mach/system.h b/arch/arm/mach-iop33x/include/mach/system.h
index 7bf3bfb49446..0cb3ad862acd 100644
--- a/arch/arm/mach-iop33x/include/mach/system.h
+++ b/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/drivers/net/irda/sa1100_ir.c b/drivers/net/irda/sa1100_ir.c
index a95188948de7..0813b5295f52 100644
--- a/drivers/net/irda/sa1100_ir.c
+++ b/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>