projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
[oweals/u-boot.git]
/
drivers
/
gpio
/
kw_gpio.c
diff --git
a/drivers/gpio/kw_gpio.c
b/drivers/gpio/kw_gpio.c
index 56383c2875aead5630e4cb123fb9c0cb769905d1..51a826de3b9a161bef34d4a4f81b278c4bd7e936 100644
(file)
--- a/
drivers/gpio/kw_gpio.c
+++ b/
drivers/gpio/kw_gpio.c
@@
-31,6
+31,7
@@
#include <common.h>
#include <asm/bitops.h>
#include <common.h>
#include <asm/bitops.h>
+#include <asm/io.h>
#include <asm/arch/kirkwood.h>
#include <asm/arch/gpio.h>
#include <asm/arch/kirkwood.h>
#include <asm/arch/gpio.h>
@@
-109,7
+110,7
@@
void kw_gpio_set_valid(unsigned pin, int mode)
*/
int kw_gpio_direction_input(unsigned pin)
{
*/
int kw_gpio_direction_input(unsigned pin)
{
- if (
!kw_gpio_is_valid(pin, GPIO_INPUT_OK)
)
+ if (
kw_gpio_is_valid(pin, GPIO_INPUT_OK) != 0
)
return 1;
/* Configure GPIO direction. */
return 1;
/* Configure GPIO direction. */