diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 08:24:16 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 08:24:16 -0500 |
| commit | a32737e1ca650504f172292dd344eb64c02311f3 (patch) | |
| tree | 7dd2004ece26081507af877d9dd40b1bd4eecc1a /arch/arm/include/asm/gpio.h | |
| parent | 27edacac7d97d37ec77779c7da08345298a5d283 (diff) | |
| parent | a3c2b511a844641f6d0b60bd84cd6076143b3f2d (diff) | |
Merge branches 'fixes' and 'misc' into for-linus
Diffstat (limited to 'arch/arm/include/asm/gpio.h')
| -rw-r--r-- | arch/arm/include/asm/gpio.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h index 11ad0bfbb0ad..7151753b0989 100644 --- a/arch/arm/include/asm/gpio.h +++ b/arch/arm/include/asm/gpio.h | |||
| @@ -1,6 +1,10 @@ | |||
| 1 | #ifndef _ARCH_ARM_GPIO_H | 1 | #ifndef _ARCH_ARM_GPIO_H |
| 2 | #define _ARCH_ARM_GPIO_H | 2 | #define _ARCH_ARM_GPIO_H |
| 3 | 3 | ||
| 4 | #if CONFIG_ARCH_NR_GPIO > 0 | ||
| 5 | #define ARCH_NR_GPIO CONFIG_ARCH_NR_GPIO | ||
| 6 | #endif | ||
| 7 | |||
| 4 | /* not all ARM platforms necessarily support this API ... */ | 8 | /* not all ARM platforms necessarily support this API ... */ |
| 5 | #include <mach/gpio.h> | 9 | #include <mach/gpio.h> |
| 6 | 10 | ||