diff options
| author | Olof Johansson <olof@lixom.net> | 2016-06-20 01:43:50 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-06-20 01:43:50 -0400 |
| commit | cfa999ef5bd2ee91ac419b4de2aca24d3a5d35ac (patch) | |
| tree | a72b2412c7c89112d1458347af43b97e92023c7c | |
| parent | 97e80da3158126591c8a8d3fed922fe53c872003 (diff) | |
| parent | 9c7a68017503eda3071ba8647bd0b4c716f18c74 (diff) | |
Merge tag 'arm-soc/for-4.8/soc-arm64' of http://github.com/Broadcom/stblinux into next/arm64
This pull request contains SoC changes for Broadcom ARM64-based SoCs:
- Kamlakant updates the Broadcom Vulcan Kconfig entry with GPIOLIB to enable
GPIO on these platforms
* tag 'arm-soc/for-4.8/soc-arm64' of http://github.com/Broadcom/stblinux:
arm64: vulcan: enable GPIOLIB in Kconfig
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm64/Kconfig.platforms | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 8e0eedc39ed3..f5e7db6d6b2e 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms | |||
| @@ -171,6 +171,7 @@ config ARCH_VEXPRESS | |||
| 171 | 171 | ||
| 172 | config ARCH_VULCAN | 172 | config ARCH_VULCAN |
| 173 | bool "Broadcom Vulcan SOC Family" | 173 | bool "Broadcom Vulcan SOC Family" |
| 174 | select GPIOLIB | ||
| 174 | help | 175 | help |
| 175 | This enables support for Broadcom Vulcan SoC Family | 176 | This enables support for Broadcom Vulcan SoC Family |
| 176 | 177 | ||