summaryrefslogtreecommitdiff
path: root/drivers/pinctrl
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-04-13 15:27:26 +0300
committerTom Rini <trini@konsulko.com>2019-04-13 15:27:26 +0300
commit0a5228be868622894a5f8f226203cd7bac562187 (patch)
tree180df0714bcd961c378fb4569cd9b40bd366e5fc /drivers/pinctrl
parent015289580f81733f7358227743e3e5881653a797 (diff)
parentc3b6c8e2d8fb5b8d0d67858dc4a2133b7065df5b (diff)
downloadu-boot-0a5228be868622894a5f8f226203cd7bac562187.tar.xz
Merge tag 'mips-pull-2019-04-12' of git://git.denx.de/u-boot-mips
- mt76xx: add USB support, small fixes - ath79: small fixes, add support for QCA9563 SoC and AP152 reference board - mscc: small fixes, add network support for JR2 and ServalT SoCs - bmips: small fixes, enable more drivers for ARM specific BCM6858 and BCM63158 SoCs - MIPS: fix redundant relocation of initrd images
Diffstat (limited to 'drivers/pinctrl')
-rw-r--r--drivers/pinctrl/ath79/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/ath79/Makefile b/drivers/pinctrl/ath79/Makefile
index 1daa2123a1..c7d1e44882 100644
--- a/drivers/pinctrl/ath79/Makefile
+++ b/drivers/pinctrl/ath79/Makefile
@@ -1,4 +1,4 @@
# SPDX-License-Identifier: GPL-2.0+
obj-$(CONFIG_PINCTRL_AR933X) += pinctrl_ar933x.o
-obj-$(CONFIG_PINCTRL_QCA953x) += pinctrl_qca953x.o
+obj-$(CONFIG_PINCTRL_QCA953X) += pinctrl_qca953x.o