diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 16:15:57 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 16:15:57 +1100 |
commit | de8fdfbee55bdebd048ec45854c9c0fc30240c7f (patch) | |
tree | 3c193ea8ced47b9018eb3bd1a73956d2b9d564fd /drivers/pinctrl/bcm/Kconfig | |
parent | 6641ce8e95e9cb5c678cf882f9eb7c7632fa1a2c (diff) | |
parent | 171cef6d6ec6c1b4e95f2053545b2dd91931518b (diff) |
Merge branch 'akpm/master'
Diffstat (limited to 'drivers/pinctrl/bcm/Kconfig')
-rw-r--r-- | drivers/pinctrl/bcm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/bcm/Kconfig b/drivers/pinctrl/bcm/Kconfig index 8968dd7aebed..e8c4e4f934a6 100644 --- a/drivers/pinctrl/bcm/Kconfig +++ b/drivers/pinctrl/bcm/Kconfig @@ -70,7 +70,7 @@ config PINCTRL_CYGNUS_MUX The Broadcom Cygnus IOMUX driver supports group based IOMUX configuration, with the exception that certain individual pins - can be overrided to GPIO function + can be overridden to GPIO function config PINCTRL_NSP_GPIO bool "Broadcom NSP GPIO (with PINCONF) driver" |