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

Commit 13420c6b authored by Sascha Hauer's avatar Sascha Hauer
Browse files

Merge branches 'fixes/imx3-build', 'fixes/imx_ioremap' and 'fixes/maintainer-update' into imx-fixes

parents 87514fce 807dfe70 adf79292

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -789,6 +789,7 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
S:	Maintained

T:	git git://git.pengutronix.de/git/imx/linux-2.6.git

F:	arch/arm/mach-mx*/

F:	arch/arm/mach-imx/

F:	arch/arm/plat-mxc/



ARM/FREESCALE IMX51

arch/arm/plat-mxc/system.c

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/io.h>

#include <linux/err.h>

#include <linux/delay.h>

#include <linux/module.h>



#include <mach/hardware.h>

#include <mach/common.h>
@@ -30,6 +31,7 @@ 


void (*imx_idle)(void) = NULL;

void __iomem *(*imx_ioremap)(unsigned long, size_t, unsigned int) = NULL;

EXPORT_SYMBOL_GPL(imx_ioremap);



static void __iomem *wdog_base;