Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel

Conflicts:

	arch/arm/mach-at91/gpio.c
This commit is contained in:
Russell King 2009-03-13 21:44:51 +00:00 • committed by Russell King
commit 97fb44eb6b
1121 changed files with 41599 additions and 21839 deletions

View file

@ -114,7 +114,7 @@ static inline void setmosi(const struct spi_device *spi, int is_on)
static inline int getmiso(const struct spi_device *spi)
{
return gpio_get_value(SPI_MISO_GPIO);
return !!gpio_get_value(SPI_MISO_GPIO);
}
#undef pdata