2dcf78c0ee
There are some more conflicts than detected by git, namely support for the newly added cpuimx machines needed to be converted to dynamic device registration. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Conflicts: arch/arm/mach-imx/Makefile arch/arm/mach-imx/devices.c arch/arm/mach-imx/devices.h arch/arm/mach-imx/eukrea_mbimx27-baseboard.c arch/arm/mach-mx2/Kconfig arch/arm/mach-mx25/Makefile arch/arm/mach-mx25/devices.c arch/arm/plat-mxc/include/mach/mx25.h arch/arm/plat-mxc/include/mach/mxc_nand.h |
||
|---|---|---|
| .. | ||
| clock.c | ||
| devices-imx25.h | ||
| devices.c | ||
| devices.h | ||
| eukrea_mbimxsd-baseboard.c | ||
| Kconfig | ||
| mach-cpuimx25.c | ||
| mach-mx25_3ds.c | ||
| Makefile | ||
| Makefile.boot | ||
| mm.c | ||