diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2015-12-17 08:57:46 -0500 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2015-12-17 08:57:46 -0500 |
commit | 4dccc93f1e7f4e2fd92a48c40a7ac9211a029352 (patch) | |
tree | 717a183f0dba200a882126cf095f38e319302c51 /drivers/pinctrl/Kconfig | |
parent | d4eed63bb8a3749a6cf19bbc98c943fafb4a826d (diff) | |
parent | 9f9499ae8e6415cefc4fe0a96ad0e27864353c89 (diff) |
Merge tag 'v4.4-rc5' into devel
Linux 4.4-rc5
Diffstat (limited to 'drivers/pinctrl/Kconfig')
-rw-r--r-- | drivers/pinctrl/Kconfig | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig index 2b80a796d966..99a4c10ed43f 100644 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig | |||
@@ -5,8 +5,6 @@ | |||
5 | config PINCTRL | 5 | config PINCTRL |
6 | bool | 6 | bool |
7 | 7 | ||
8 | if PINCTRL | ||
9 | |||
10 | menu "Pin controllers" | 8 | menu "Pin controllers" |
11 | depends on PINCTRL | 9 | depends on PINCTRL |
12 | 10 | ||
@@ -275,5 +273,3 @@ config PINCTRL_TB10X | |||
275 | select GPIOLIB | 273 | select GPIOLIB |
276 | 274 | ||
277 | endmenu | 275 | endmenu |
278 | |||
279 | endif | ||