mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
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:
commit
97fb44eb6b
1121 changed files with 41599 additions and 21839 deletions
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue