diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-12 17:32:52 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-12 17:32:52 -0400 |
| commit | 9311c593f24f28de2a339da602644f0f7ae0fc60 (patch) | |
| tree | 26f5245a4e874fff8870df95dd91ef213f6637eb /arch/arm | |
| parent | c06b4889c340da483d35a877ef9195c0401319b9 (diff) | |
| parent | 20214fcd74bddc16d65d466212f5dd32aafe8868 (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-mx1/devices.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mx1/mx1ads.c | 1 |
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 @@ | |||
| 23 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 24 | #include <linux/platform_device.h> | 24 | #include <linux/platform_device.h> |
| 25 | #include <linux/gpio.h> | 25 | #include <linux/gpio.h> |
| 26 | |||
| 27 | #include <mach/irqs.h> | ||
| 26 | #include <mach/hardware.h> | 28 | #include <mach/hardware.h> |
| 27 | 29 | ||
| 28 | static struct resource imx_csi_resources[] = { | 30 | 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 @@ | |||
| 21 | #include <asm/mach/arch.h> | 21 | #include <asm/mach/arch.h> |
| 22 | #include <asm/mach/time.h> | 22 | #include <asm/mach/time.h> |
| 23 | 23 | ||
| 24 | #include <mach/irqs.h> | ||
| 24 | #include <mach/hardware.h> | 25 | #include <mach/hardware.h> |
| 25 | #include <mach/common.h> | 26 | #include <mach/common.h> |
| 26 | #include <mach/imx-uart.h> | 27 | #include <mach/imx-uart.h> |