diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-09-05 10:38:53 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-09-05 10:38:53 +0200 |
| commit | 8f9d4007c53cefc513619b83b5b81b146423b11b (patch) | |
| tree | 88242ae77da977fca2a8777936509534bf8f0b45 /arch/arm/include | |
| parent | ec102f635b41a7613a034c84e85559b46ed1c1f3 (diff) | |
| parent | 8c1180c3eda1c4c50ffa31fdd6a764026ce51a65 (diff) | |
| download | barebox-8f9d4007c53cefc513619b83b5b81b146423b11b.tar.gz barebox-8f9d4007c53cefc513619b83b5b81b146423b11b.tar.xz | |
Merge branch 'for-next/arm-gpio'
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/gpio.h | 5 |
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 */ |