Commit 35486508 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'zte-soc-4.14' of...

Merge tag 'zte-soc-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/arm64

Pull "ZTE SoC updates for 4.14" from Shawn Guo:

 - Select PINCTRL for ZTE platform, so that pinctrl driver for ZX296718
   can be enabled.

* tag 'zte-soc-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  arm64: select PINCTRL for ZTE platform
parents 32f4049a 03d95c26
...@@ -250,6 +250,7 @@ config ARCH_XGENE ...@@ -250,6 +250,7 @@ config ARCH_XGENE
config ARCH_ZX config ARCH_ZX
bool "ZTE ZX SoC Family" bool "ZTE ZX SoC Family"
select PINCTRL
help help
This enables support for ZTE ZX SoC Family This enables support for ZTE ZX SoC Family
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment