diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2014-06-04 09:14:49 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2014-06-30 15:37:32 -0400 |
commit | dfa46d23406f8aaf4e4ea2410816c3ed736398eb (patch) | |
tree | 62d0ff81e02efe58af03d3a1540d82ff7c7a1168 | |
parent | 2fd48f94426d25e59732a54e2a983796714729fa (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/Kconfig | 7 | ||||
-rw-r--r-- | arch/arm/include/asm/gpio.h | 5 |
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 | |||
239 | this feature (eg, building a kernel for a single machine) and | 239 | this feature (eg, building a kernel for a single machine) and |
240 | you need to shrink the kernel to the minimal size. | 240 | you need to shrink the kernel to the minimal size. |
241 | 241 | ||
242 | config NEED_MACH_GPIO_H | ||
243 | bool | ||
244 | help | ||
245 | Select this when mach/gpio.h is required to provide special | ||
246 | definitions for this platform. The need for mach/gpio.h should | ||
247 | be avoided when possible. | ||
248 | |||
249 | config NEED_MACH_IO_H | 242 | config NEED_MACH_IO_H |
250 | bool | 243 | bool |
251 | help | 244 | 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 @@ | |||
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 | /* not all ARM platforms necessarily support this API ... */ | ||
9 | #ifdef CONFIG_NEED_MACH_GPIO_H | ||
10 | #include <mach/gpio.h> | ||
11 | #endif | ||
12 | |||
13 | #ifndef __ARM_GPIOLIB_COMPLEX | 8 | #ifndef __ARM_GPIOLIB_COMPLEX |
14 | /* Note: this may rely upon the value of ARCH_NR_GPIOS set in mach/gpio.h */ | 9 | /* Note: this may rely upon the value of ARCH_NR_GPIOS set in mach/gpio.h */ |
15 | #include <asm-generic/gpio.h> | 10 | #include <asm-generic/gpio.h> |