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:
@@ -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
|
||||
|
Reference in New Issue
Block a user