diff options
author | Florian Fainelli <f.fainelli@gmail.com> | 2016-04-16 22:46:14 +0200 |
---|---|---|
committer | Florian Fainelli <f.fainelli@gmail.com> | 2016-04-18 23:20:30 +0200 |
commit | b0ec633c28d42281c03b41dbc92a4448a481f2f3 (patch) | |
tree | 9f9c69b14c245559cbae4df2f925ba96ca7598e5 | |
parent | soc: brcmstb: add SoC driver to brcmstb (diff) | |
download | linux-b0ec633c28d42281c03b41dbc92a4448a481f2f3.tar.xz linux-b0ec633c28d42281c03b41dbc92a4448a481f2f3.zip |
bus: brcmstb_gisb: Rework dependencies
Do not have the machine Kconfig entry point need to select
BRCMSTB_GISB_ARB, instead, just let it be default ARCH_BRCMSTB which is
a better way to deal with this. While at it, also make it default
BMIPS_GENERIC so the legacy MIPS-based STB platforms can benefit from
the same thing.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
-rw-r--r-- | arch/arm/mach-bcm/Kconfig | 1 | ||||
-rw-r--r-- | drivers/bus/Kconfig | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig index b95ea1135ef9..68ab6412392a 100644 --- a/arch/arm/mach-bcm/Kconfig +++ b/arch/arm/mach-bcm/Kconfig @@ -173,7 +173,6 @@ config ARCH_BRCMSTB select ARM_GIC select ARM_ERRATA_798181 if SMP select HAVE_ARM_ARCH_TIMER - select BRCMSTB_GISB_ARB select BRCMSTB_L2_IRQ select BCM7120_L2_IRQ select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE diff --git a/drivers/bus/Kconfig b/drivers/bus/Kconfig index d4a3a3133da5..8807495e0efd 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 |