summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2014-06-04 15:26:42 +0200
committerLinus Walleij <linus.walleij@linaro.org>2014-06-30 21:37:39 +0200
commit53430333c345c3531f9443d43c6fba1da693abe4 (patch)
tree715e5bba15561917d50a0082e231a687c9ff6544
parentdfa46d23406f8aaf4e4ea2410816c3ed736398eb (diff)
ARM: delete old reference to ARM_GPIOLIB_COMPLEXgpio-h-purge
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.h2
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 @@
#define ARCH_NR_GPIOS CONFIG_ARCH_NR_GPIO
#endif
-#ifndef __ARM_GPIOLIB_COMPLEX
/* Note: this may rely upon the value of ARCH_NR_GPIOS set in mach/gpio.h */
#include <asm-generic/gpio.h>
@@ -13,7 +12,6 @@
#define gpio_get_value __gpio_get_value
#define gpio_set_value __gpio_set_value
#define gpio_cansleep __gpio_cansleep
-#endif
/*
* Provide a default gpio_to_irq() which should satisfy every case.