diff options
author | Alexandre Courbot <acourbot@nvidia.com> | 2013-03-28 08:07:46 -0400 |
---|---|---|
committer | Alexandre Courbot <acourbot@nvidia.com> | 2013-04-16 05:47:19 -0400 |
commit | 7fd2bf3d325478e6715cce3ede7de641ff596183 (patch) | |
tree | 633484cf096ac914ed518f9d956bce767a568cab /arch/arm | |
parent | 76ec9d18b8972f1b228f819f6126c9f022b3e642 (diff) |
Remove GENERIC_GPIO config option
GENERIC_GPIO has been made equivalent to GPIOLIB in architecture code
and all driver code has been switch to depend on GPIOLIB. It is thus
safe to have GENERIC_GPIO removed.
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/Kconfig | 3 | ||||
-rw-r--r-- | arch/arm/plat-orion/gpio.c | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 13b739469c51..ceac9a43da7d 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -107,9 +107,6 @@ config MIGHT_HAVE_PCI | |||
107 | config SYS_SUPPORTS_APM_EMULATION | 107 | config SYS_SUPPORTS_APM_EMULATION |
108 | bool | 108 | bool |
109 | 109 | ||
110 | config GENERIC_GPIO | ||
111 | bool | ||
112 | |||
113 | config HAVE_TCM | 110 | config HAVE_TCM |
114 | bool | 111 | bool |
115 | select GENERIC_ALLOCATOR | 112 | select GENERIC_ALLOCATOR |
diff --git a/arch/arm/plat-orion/gpio.c b/arch/arm/plat-orion/gpio.c index c29ee7ea200b..59ddf4d0aca9 100644 --- a/arch/arm/plat-orion/gpio.c +++ b/arch/arm/plat-orion/gpio.c | |||
@@ -150,7 +150,7 @@ err_out: | |||
150 | } | 150 | } |
151 | 151 | ||
152 | /* | 152 | /* |
153 | * GENERIC_GPIO primitives. | 153 | * GPIO primitives. |
154 | */ | 154 | */ |
155 | static int orion_gpio_request(struct gpio_chip *chip, unsigned pin) | 155 | static int orion_gpio_request(struct gpio_chip *chip, unsigned pin) |
156 | { | 156 | { |