summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2014-06-04 15:14:49 +0200
committerLinus Walleij <linus.walleij@linaro.org>2014-06-30 21:37:32 +0200
commitdfa46d23406f8aaf4e4ea2410816c3ed736398eb (patch)
tree62d0ff81e02efe58af03d3a1540d82ff7c7a1168
parent2fd48f94426d25e59732a54e2a983796714729fa (diff)
ARM: kill CONFIG_NEED_MACH_GPIO_H
The long pain of maintaining the legacy <mach/gpio.h> include ladder is now gone with S5P as the last user being deleted. Cut this Kconfig option and remove the inclusion directive in <asm/gpio.h> for good. Acked-by: Alexandre Courbot <acourbot@nvidia.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--arch/arm/Kconfig7
-rw-r--r--arch/arm/include/asm/gpio.h5
2 files changed, 0 insertions, 12 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index f5d9ef9c11b7..7fd67afcd1ff 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -239,13 +239,6 @@ config ARM_PATCH_PHYS_VIRT
this feature (eg, building a kernel for a single machine) and
you need to shrink the kernel to the minimal size.
-config NEED_MACH_GPIO_H
- bool
- help
- Select this when mach/gpio.h is required to provide special
- definitions for this platform. The need for mach/gpio.h should
- be avoided when possible.
-
config NEED_MACH_IO_H
bool
help
diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h
index 477e0206e016..5e1742ea36b7 100644
--- a/arch/arm/include/asm/gpio.h
+++ b/arch/arm/include/asm/gpio.h
@@ -5,11 +5,6 @@
#define ARCH_NR_GPIOS CONFIG_ARCH_NR_GPIO
#endif
-/* not all ARM platforms necessarily support this API ... */
-#ifdef CONFIG_NEED_MACH_GPIO_H
-#include <mach/gpio.h>
-#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>