5 Commits

Author	SHA1	Message	Date
Baruch Siach	47be6b92c3	ARM: imx/mx25: dynamically allocate pwm devices ... Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>	2011-03-08 13:24:24 +01:00
Baruch Siach	cba57eb7d5	ARM: imx/mx25: fix (again) spi device registration typo ... This typo was fixed in 46e3f30 (mx25: fix spi device registration typo), but a the merge at 0e44e059 (Merge commit 'v2.6.37-rc4' into imx-for-2.6.38) resolved the merge conflict wrongly. Cc: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>	2011-03-08 13:24:23 +01:00
Sascha Hauer	0e44e05958	Merge commit 'v2.6.37-rc4' into imx-for-2.6.38 ... Done to resolve merge conflict: Conflicts: arch/arm/mach-mx25/devices-imx25.h Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>	2010-12-06 09:36:17 +01:00
Uwe Kleine-König	124bf94a9f	ARM: imx: fix name for functions adding sdhci-esdhc-imx devices ... and restore alphabetic ordering. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>	2010-11-19 21:59:51 +01:00
Uwe Kleine-König	e48ab1c16f	ARM: imx: move mx25 support to mach-imx ... Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>	2010-11-19 21:53:49 +01:00