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

9311c593 · Russell King · Russell King · c06b4889 · 20214fcd · 9311c593
隐藏空白更改
内联并排

Showing with 3 addition and 0 deletion

arch/arm/mach-mx1/devices.c arch/arm/mach-mx1/devices.c +2 -0

arch/arm/mach-mx1/mx1ads.c arch/arm/mach-mx1/mx1ads.c +1 -0

未找到文件。
--- 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[] = {

--- 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>