summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-03-12 21:32:52 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-03-12 21:32:52 +0000
commit9311c593f24f28de2a339da602644f0f7ae0fc60 (patch)
tree26f5245a4e874fff8870df95dd91ef213f6637eb /arch
parentc06b4889c340da483d35a877ef9195c0401319b9 (diff)
parent20214fcd74bddc16d65d466212f5dd32aafe8868 (diff)
downloadblackbird-op-linux-9311c593f24f28de2a339da602644f0f7ae0fc60.tar.gz
blackbird-op-linux-9311c593f24f28de2a339da602644f0f7ae0fc60.zip
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-mx1/devices.c2
-rw-r--r--arch/arm/mach-mx1/mx1ads.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-mx1/devices.c b/arch/arm/mach-mx1/devices.c
index 686d8d2dbb24..a95644193f3f 100644
--- a/arch/arm/mach-mx1/devices.c
+++ b/arch/arm/mach-mx1/devices.c
@@ -23,6 +23,8 @@
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/gpio.h>
+
+#include <mach/irqs.h>
#include <mach/hardware.h>
static struct resource imx_csi_resources[] = {
diff --git a/arch/arm/mach-mx1/mx1ads.c b/arch/arm/mach-mx1/mx1ads.c
index 2e4b185fe4a9..3200cf60e384 100644
--- a/arch/arm/mach-mx1/mx1ads.c
+++ b/arch/arm/mach-mx1/mx1ads.c
@@ -21,6 +21,7 @@
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
+#include <mach/irqs.h>
#include <mach/hardware.h>
#include <mach/common.h>
#include <mach/imx-uart.h>
OpenPOWER on IntegriCloud