summaryrefslogtreecommitdiff
path: root/drivers/bus
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-04-25 23:48:29 +0200
committerArnd Bergmann <arnd@arndb.de>2016-04-25 23:48:29 +0200
commitc6ba3f693297fb900ad7435cc963abd2582b1176 (patch)
tree592caab877aef6bb45ca880abc430061e9dc4023 /drivers/bus
parent21e8868e661ededd2c45c8ec27f6fd5354b88b71 (diff)
parentb0ec633c28d42281c03b41dbc92a4448a481f2f3 (diff)
Merge tag 'arm-soc/for-4.7/drivers' of http://github.com/Broadcom/stblinux into next/drivers
Merge "Broadcom ARM-based SoCs drivers changes" from Florian Fainelli: - Justin adds a soc_dev driver to properly report to user-space the Broadcom STB SoC family, product and revision - Florian reworks how the brcmstb_gisb driver dependency is done to enable it on Broadcom STB MIPS-based SoCs and remove a select in arch/arm/mach-bcm/Kconfig * tag 'arm-soc/for-4.7/drivers' of http://github.com/Broadcom/stblinux: bus: brcmstb_gisb: Rework dependencies soc: brcmstb: add SoC driver to brcmstb
Diffstat (limited to 'drivers/bus')
-rw-r--r--drivers/bus/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/bus/Kconfig b/drivers/bus/Kconfig
index 67cebd3d7f2d..f5ea153f53e9 100644
--- a/drivers/bus/Kconfig
+++ b/drivers/bus/Kconfig
@@ -58,6 +58,7 @@ config ARM_CCN
config BRCMSTB_GISB_ARB
bool "Broadcom STB GISB bus arbiter"
depends on ARM || MIPS
+ default ARCH_BRCMSTB || BMIPS_GENERIC
help
Driver for the Broadcom Set Top Box System-on-a-chip internal bus
arbiter. This driver provides timeout and target abort error handling