tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

authored by

Russell King and committed by
Russell King 9311c593 c06b4889

+3
+2
arch/arm/mach-mx1/devices.c
··· 23 23 #include <linux/init.h> 24 24 #include <linux/platform_device.h> 25 25 #include <linux/gpio.h> 26 + 27 + #include <mach/irqs.h> 26 28 #include <mach/hardware.h> 27 29 28 30 static struct resource imx_csi_resources[] = {
+1
arch/arm/mach-mx1/mx1ads.c
··· 21 21 #include <asm/mach/arch.h> 22 22 #include <asm/mach/time.h> 23 23 24 + #include <mach/irqs.h> 24 25 #include <mach/hardware.h> 25 26 #include <mach/common.h> 26 27 #include <mach/imx-uart.h>