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>

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/blackfin/cpu/Makefile b/arch/blackfin/cpu/Makefile
index 9bf544d800..243dc22a0c 100644
--- a/arch/blackfin/cpu/Makefile
+++ b/arch/blackfin/cpu/Makefile
@@ -14,7 +14,7 @@ extra-y += initcode.o
 extra-y += start.o
 obj-y    := interrupt.o cache.o
 obj-y  += cpu.o
-obj-$(CONFIG_ADI_GPIO1) += gpio.o
+obj-y += gpio.o
 obj-y  += interrupts.o
 obj-$(CONFIG_JTAG_CONSOLE) += jtag-console.o
 obj-y  += os_log.o