diff options
| author | Alexandre Courbot <acourbot@nvidia.com> | 2013-03-28 07:34:56 -0400 |
|---|---|---|
| committer | Alexandre Courbot <acourbot@nvidia.com> | 2013-04-16 05:47:14 -0400 |
| commit | 76ec9d18b8972f1b228f819f6126c9f022b3e642 (patch) | |
| tree | c860b7360ffc3a99b2eb6db8cf132bffd4191804 /drivers/pinctrl | |
| parent | a2523d3cdab76fbda28414fd82743815f3cc3df7 (diff) | |
Convert selectors of GENERIC_GPIO to GPIOLIB
GENERIC_GPIO is now equivalent to GPIOLIB and features that depended on
GENERIC_GPIO can now depend on GPIOLIB to allow removal of this option.
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 'drivers/pinctrl')
| -rw-r--r-- | drivers/pinctrl/sh-pfc/Kconfig | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/pinctrl/sh-pfc/Kconfig b/drivers/pinctrl/sh-pfc/Kconfig index c3340f54d2ad..99ba8e4f2a30 100644 --- a/drivers/pinctrl/sh-pfc/Kconfig +++ b/drivers/pinctrl/sh-pfc/Kconfig | |||
| @@ -6,7 +6,7 @@ if ARCH_SHMOBILE || SUPERH | |||
| 6 | 6 | ||
| 7 | config PINCTRL_SH_PFC | 7 | config PINCTRL_SH_PFC |
| 8 | # XXX move off the gpio dependency | 8 | # XXX move off the gpio dependency |
| 9 | depends on GENERIC_GPIO | 9 | depends on GPIOLIB |
| 10 | select GPIO_SH_PFC if ARCH_REQUIRE_GPIOLIB | 10 | select GPIO_SH_PFC if ARCH_REQUIRE_GPIOLIB |
| 11 | select PINMUX | 11 | select PINMUX |
| 12 | select PINCONF | 12 | select PINCONF |
| @@ -34,19 +34,19 @@ config PINCTRL_PFC_R8A7779 | |||
| 34 | config PINCTRL_PFC_SH7203 | 34 | config PINCTRL_PFC_SH7203 |
| 35 | def_bool y | 35 | def_bool y |
| 36 | depends on CPU_SUBTYPE_SH7203 | 36 | depends on CPU_SUBTYPE_SH7203 |
| 37 | depends on GENERIC_GPIO | 37 | depends on GPIOLIB |
| 38 | select PINCTRL_SH_PFC | 38 | select PINCTRL_SH_PFC |
| 39 | 39 | ||
| 40 | config PINCTRL_PFC_SH7264 | 40 | config PINCTRL_PFC_SH7264 |
| 41 | def_bool y | 41 | def_bool y |
| 42 | depends on CPU_SUBTYPE_SH7264 | 42 | depends on CPU_SUBTYPE_SH7264 |
| 43 | depends on GENERIC_GPIO | 43 | depends on GPIOLIB |
| 44 | select PINCTRL_SH_PFC | 44 | select PINCTRL_SH_PFC |
| 45 | 45 | ||
| 46 | config PINCTRL_PFC_SH7269 | 46 | config PINCTRL_PFC_SH7269 |
| 47 | def_bool y | 47 | def_bool y |
| 48 | depends on CPU_SUBTYPE_SH7269 | 48 | depends on CPU_SUBTYPE_SH7269 |
| 49 | depends on GENERIC_GPIO | 49 | depends on GPIOLIB |
| 50 | select PINCTRL_SH_PFC | 50 | select PINCTRL_SH_PFC |
| 51 | 51 | ||
| 52 | config PINCTRL_PFC_SH7372 | 52 | config PINCTRL_PFC_SH7372 |
| @@ -62,55 +62,55 @@ config PINCTRL_PFC_SH73A0 | |||
| 62 | config PINCTRL_PFC_SH7720 | 62 | config PINCTRL_PFC_SH7720 |
| 63 | def_bool y | 63 | def_bool y |
| 64 | depends on CPU_SUBTYPE_SH7720 | 64 | depends on CPU_SUBTYPE_SH7720 |
| 65 | depends on GENERIC_GPIO | 65 | depends on GPIOLIB |
| 66 | select PINCTRL_SH_PFC | 66 | select PINCTRL_SH_PFC |
| 67 | 67 | ||
| 68 | config PINCTRL_PFC_SH7722 | 68 | config PINCTRL_PFC_SH7722 |
| 69 | def_bool y | 69 | def_bool y |
| 70 | depends on CPU_SUBTYPE_SH7722 | 70 | depends on CPU_SUBTYPE_SH7722 |
| 71 | depends on GENERIC_GPIO | 71 | depends on GPIOLIB |
| 72 | select PINCTRL_SH_PFC | 72 | select PINCTRL_SH_PFC |
| 73 | 73 | ||
| 74 | config PINCTRL_PFC_SH7723 | 74 | config PINCTRL_PFC_SH7723 |
| 75 | def_bool y | 75 | def_bool y |
| 76 | depends on CPU_SUBTYPE_SH7723 | 76 | depends on CPU_SUBTYPE_SH7723 |
| 77 | depends on GENERIC_GPIO | 77 | depends on GPIOLIB |
| 78 | select PINCTRL_SH_PFC | 78 | select PINCTRL_SH_PFC |
| 79 | 79 | ||
| 80 | config PINCTRL_PFC_SH7724 | 80 | config PINCTRL_PFC_SH7724 |
| 81 | def_bool y | 81 | def_bool y |
| 82 | depends on CPU_SUBTYPE_SH7724 | 82 | depends on CPU_SUBTYPE_SH7724 |
| 83 | depends on GENERIC_GPIO | 83 | depends on GPIOLIB |
| 84 | select PINCTRL_SH_PFC | 84 | select PINCTRL_SH_PFC |
| 85 | 85 | ||
| 86 | config PINCTRL_PFC_SH7734 | 86 | config PINCTRL_PFC_SH7734 |
| 87 | def_bool y | 87 | def_bool y |
| 88 | depends on CPU_SUBTYPE_SH7734 | 88 | depends on CPU_SUBTYPE_SH7734 |
| 89 | depends on GENERIC_GPIO | 89 | depends on GPIOLIB |
| 90 | select PINCTRL_SH_PFC | 90 | select PINCTRL_SH_PFC |
| 91 | 91 | ||
| 92 | config PINCTRL_PFC_SH7757 | 92 | config PINCTRL_PFC_SH7757 |
| 93 | def_bool y | 93 | def_bool y |
| 94 | depends on CPU_SUBTYPE_SH7757 | 94 | depends on CPU_SUBTYPE_SH7757 |
| 95 | depends on GENERIC_GPIO | 95 | depends on GPIOLIB |
| 96 | select PINCTRL_SH_PFC | 96 | select PINCTRL_SH_PFC |
| 97 | 97 | ||
| 98 | config PINCTRL_PFC_SH7785 | 98 | config PINCTRL_PFC_SH7785 |
| 99 | def_bool y | 99 | def_bool y |
| 100 | depends on CPU_SUBTYPE_SH7785 | 100 | depends on CPU_SUBTYPE_SH7785 |
| 101 | depends on GENERIC_GPIO | 101 | depends on GPIOLIB |
| 102 | select PINCTRL_SH_PFC | 102 | select PINCTRL_SH_PFC |
| 103 | 103 | ||
| 104 | config PINCTRL_PFC_SH7786 | 104 | config PINCTRL_PFC_SH7786 |
| 105 | def_bool y | 105 | def_bool y |
| 106 | depends on CPU_SUBTYPE_SH7786 | 106 | depends on CPU_SUBTYPE_SH7786 |
| 107 | depends on GENERIC_GPIO | 107 | depends on GPIOLIB |
| 108 | select PINCTRL_SH_PFC | 108 | select PINCTRL_SH_PFC |
| 109 | 109 | ||
| 110 | config PINCTRL_PFC_SHX3 | 110 | config PINCTRL_PFC_SHX3 |
| 111 | def_bool y | 111 | def_bool y |
| 112 | depends on CPU_SUBTYPE_SHX3 | 112 | depends on CPU_SUBTYPE_SHX3 |
| 113 | depends on GENERIC_GPIO | 113 | depends on GPIOLIB |
| 114 | select PINCTRL_SH_PFC | 114 | select PINCTRL_SH_PFC |
| 115 | 115 | ||
| 116 | endif | 116 | endif |