2 Commits

Author	SHA1	Message	Date
Jiri Kosina	d790d4d583	Merge branch 'master' into for-next	2010-08-04 15:14:38 +02:00
Uwe Kleine-König	9f72ffedc8	ARM: imx: new Kconfig symbol and feature test macro for DMA on mx1 and mx2 ... This should be used instead of hard coding the corresponding platforms. The feature test macro is needed to support different SOCs in a single kernel image. While at it rename dma-mx1-mx2 to dma-v1 as mx25 doesn't use it and so the mx2 part is wrong and move the header to arch/arm/mach-imx. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>	2010-06-30 08:59:58 +02:00