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

This commit is contained in:
Russell King 2009-03-12 21:32:52 +00:00 committed by Russell King
commit 9311c593f2
2 changed files with 3 additions and 0 deletions

View file

@ -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[] = {

View file

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