summaryrefslogtreecommitdiffstats
path: root/arch/arm/include
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2013-08-16 12:46:07 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2013-08-16 15:58:33 +0200
commit8c1180c3eda1c4c50ffa31fdd6a764026ce51a65 (patch)
tree27bc7479db693bb892b5b248c3810dab8f9e5f45 /arch/arm/include
parent1068e0a545a72fcdf329481d94f615dd00498786 (diff)
downloadbarebox-8c1180c3eda1c4c50ffa31fdd6a764026ce51a65.tar.gz
barebox-8c1180c3eda1c4c50ffa31fdd6a764026ce51a65.tar.xz
ARM: remove include of mach/gpio.h for gpiolib users
gpiolib user have nothing to define in their machine specific gpio.h, so do not include it. The only thing they could define would be ARCH_NR_GPIOS, but currently no architecture defines it. Should an architecure feel the need to do it this would be a good opportunity to get rid of this limitation. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/include')
-rw-r--r--arch/arm/include/asm/gpio.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h
index 166a7a3e28..b3c1efe739 100644
--- a/arch/arm/include/asm/gpio.h
+++ b/arch/arm/include/asm/gpio.h
@@ -1,7 +1,10 @@
#ifndef _ARCH_ARM_GPIO_H
#define _ARCH_ARM_GPIO_H
-/* not all ARM platforms necessarily support this API ... */
+#ifndef CONFIG_GPIOLIB
#include <mach/gpio.h>
+#else
+#include <asm-generic/gpio.h>
+#endif
#endif /* _ARCH_ARM_GPIO_H */