Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9311c593 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

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

parents c06b4889 20214fcd

arch/arm/mach-mx1/devices.c

+2 −0
Original line number Diff line number Diff line
@@ -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[] = {

arch/arm/mach-mx1/mx1ads.c

+1 −0
Original line number Diff line number Diff line
@@ -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>