Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6

mariux64 · Mar 12, 2009 · 9311c59 · 9311c59
2 parents c06b488 + 20214fc
commit 9311c59
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git 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
@@ -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>