litmus-rt.git - The LITMUS^RT kernel.

	Commit message (Collapse)	Author	Age
*	ARM: imx: fix build failure concerning otg/ulpi	Uwe Kleine-König	2010-08-23
\| \| \| \| \| \| \| \| \| \| \| \|	The build failure was introduced by 13dd0c9 (USB: otg/ulpi: extend the generic ulpi driver.) Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Acked-by: Igor Grinberg <grinberg@compulab.co.il> Cc: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
*	ARM: 6322/1: imx/pca100: Fix name of spi platform data	Uwe Kleine-König	2010-08-10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Commit 7536cf9 (ARM: imx: dynamically register spi_imx devices (imx27)) introduced a variable named "pca100_spi0_data" but passed "&pca100_spi_0_data" to imx27_add_spi_imx0. This wasn't noticed earlier because both SPI_IMX and MACH_PCA100 are not enabled in mx27_defconfig. This fixes a build failure: arch/arm/mach-imx/mach-pca100.c: In function 'pca100_init': arch/arm/mach-imx/mach-pca100.c:411: error: 'pca100_spi_0_data' undeclared (first use in this function) arch/arm/mach-imx/mach-pca100.c:411: error: (Each undeclared identifier is reported only once arch/arm/mach-imx/mach-pca100.c:411: error: for each function it appears in.) Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
*	Merge branch 'imx/for-2.6.36' of git://git.pengutronix.de/git/ukl/linux-2.6 ↵	Uwe Kleine-König	2010-07-26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into HEAD 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
*	ARM: imx: dynamically register imx-uart devices (imx27)	Uwe Kleine-König	2010-06-30
\| \| \| \|	Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
*	ARM: imx: dynamically register spi_imx devices (imx27)	Uwe Kleine-König	2010-06-30
\| \| \| \|	Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
*	ARM: imx: dynamically register imx-i2c devices (imx27)	Uwe Kleine-König	2010-06-30
\| \| \| \|	Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
*	ARM: imx: Change the way nand devices are registered (imx27)	Uwe Kleine-König	2010-06-30
\| \| \| \| \| \|	Make use of new mechanism to register a nand device. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
*	ARM: imx: rename mxc_uart_devicex to follow a common naming scheme	Uwe Kleine-König	2010-06-30
\| \| \| \| \| \|	Addionally remove an unneeded include. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
*	ARM: imx: rename mach dir for mx21 and mx27 to mach-imx	Uwe Kleine-König	2010-06-24
	Finally all imx code should end up there, start with mach-mx2. While touching all files rename some files to use a hyphen instead of an underscore. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>