diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2014-06-04 09:26:42 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2014-06-30 15:37:39 -0400 |
commit | 53430333c345c3531f9443d43c6fba1da693abe4 (patch) | |
tree | 715e5bba15561917d50a0082e231a687c9ff6544 | |
parent | dfa46d23406f8aaf4e4ea2410816c3ed736398eb (diff) |
ARM: delete old reference to ARM_GPIOLIB_COMPLEX
This inclusion guard became pointless after commit
40ca061b1bb8827609d39679ddde6705551cb031
"ARM: 7841/1: sa1100: remove complex GPIO interface"
which removed the last complex gpiolib interface.
Acked-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r-- | arch/arm/include/asm/gpio.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h index 5e1742ea36b7..504dcddebfcc 100644 --- a/arch/arm/include/asm/gpio.h +++ b/arch/arm/include/asm/gpio.h | |||
@@ -5,7 +5,6 @@ | |||
5 | #define ARCH_NR_GPIOS CONFIG_ARCH_NR_GPIO | 5 | #define ARCH_NR_GPIOS CONFIG_ARCH_NR_GPIO |
6 | #endif | 6 | #endif |
7 | 7 | ||
8 | #ifndef __ARM_GPIOLIB_COMPLEX | ||
9 | /* Note: this may rely upon the value of ARCH_NR_GPIOS set in mach/gpio.h */ | 8 | /* Note: this may rely upon the value of ARCH_NR_GPIOS set in mach/gpio.h */ |
10 | #include <asm-generic/gpio.h> | 9 | #include <asm-generic/gpio.h> |
11 | 10 | ||
@@ -13,7 +12,6 @@ | |||
13 | #define gpio_get_value __gpio_get_value | 12 | #define gpio_get_value __gpio_get_value |
14 | #define gpio_set_value __gpio_set_value | 13 | #define gpio_set_value __gpio_set_value |
15 | #define gpio_cansleep __gpio_cansleep | 14 | #define gpio_cansleep __gpio_cansleep |
16 | #endif | ||
17 | 15 | ||
18 | /* | 16 | /* |
19 | * Provide a default gpio_to_irq() which should satisfy every case. | 17 | * Provide a default gpio_to_irq() which should satisfy every case. |