diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-18 13:16:30 +1100 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-18 13:16:30 +1100 |
commit | c71327ad9f925a4ddbf24db80ce66165104c4ed0 (patch) | |
tree | a1560ddfb827d580843d2a32ba19fb0fc85490d8 /arch/arm/mach-mx1/devices.c | |
parent | ps3/block: Replace mtd/ps3vram by block/ps3vram (diff) | |
parent | powerpc/mm: Respect _PAGE_COHERENT on classic ppc32 SW (diff) | |
download | linux-dev-c71327ad9f925a4ddbf24db80ce66165104c4ed0.tar.xz linux-dev-c71327ad9f925a4ddbf24db80ce66165104c4ed0.zip |
Merge commit 'gcl/merge' into merge
Diffstat (limited to 'arch/arm/mach-mx1/devices.c')
-rw-r--r-- | arch/arm/mach-mx1/devices.c | 2 |
1 files changed, 2 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[] = { |