diff options
author | Tom Rini <trini@ti.com> | 2013-11-04 14:28:08 (GMT) |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2013-11-04 14:28:08 (GMT) |
commit | c0bb110b695130866838518e680bdd5473e47928 (patch) | |
tree | 590563a50a027ad53867b2144e763de02427db59 /arch/blackfin/include/asm/gpio.h | |
parent | ae12c751e5532904090c23f079e4b59160caef52 (diff) | |
parent | cae4d0403c0863176f228d410d6a29b3f4b9d595 (diff) | |
download | u-boot-c0bb110b695130866838518e680bdd5473e47928.tar.xz |
Merge branch 'master' of git://git.denx.de/u-boot-blackfin
Easy to resolve conflict on the GPIO change.
Conflicts:
arch/blackfin/cpu/Makefile
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'arch/blackfin/include/asm/gpio.h')
-rw-r--r-- | arch/blackfin/include/asm/gpio.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/blackfin/include/asm/gpio.h b/arch/blackfin/include/asm/gpio.h index 58a6191..376ec02 100644 --- a/arch/blackfin/include/asm/gpio.h +++ b/arch/blackfin/include/asm/gpio.h @@ -8,6 +8,7 @@ #define __ARCH_BLACKFIN_GPIO_H__ #include <asm-generic/gpio.h> +#include <asm/portmux.h> #define gpio_bank(x) ((x) >> 4) #define gpio_bit(x) (1<<((x) & 0xF)) @@ -141,6 +142,8 @@ struct gpio_port_t { unsigned short dummy16; unsigned short inen; }; +#else +extern struct gpio_port_t * const gpio_array[]; #endif #ifdef ADI_SPECIAL_GPIO_BANKS |