Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze

[oweals/u-boot.git] / arch / arm / include / asm / gpio.h

diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h
index d49ad080e2c30da6beb4e7e42c509c5bdd375463..fe4419cae4cfe8950dc3797e7071bf7de7eb4a43 100644 (file)
--- a/arch/arm/include/asm/gpio.h
+++ b/arch/arm/include/asm/gpio.h
@@ -1,2 +1,4 @@
+#ifndef CONFIG_ARCH_UNIPHIER
 #include <asm/arch/gpio.h>
+#endif
 #include <asm-generic/gpio.h>