diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-03-10 10:28:27 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-03-10 10:28:27 +0100 |
commit | 6cbe9e4a228ce00b9fa10d56da6cb7985d7b10e9 (patch) | |
tree | f8e52ed2acd6316d0832f084b4c633f1d19079aa /drivers/ssb/Kconfig | |
parent | futex: Replace barrier() in unqueue_me() with READ_ONCE() (diff) | |
parent | Merge tag 'spi-fix-v4.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi (diff) | |
download | linux-dev-6cbe9e4a228ce00b9fa10d56da6cb7985d7b10e9.tar.xz linux-dev-6cbe9e4a228ce00b9fa10d56da6cb7985d7b10e9.zip |
Merge branch 'linus' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/ssb/Kconfig')
-rw-r--r-- | drivers/ssb/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ssb/Kconfig b/drivers/ssb/Kconfig index 0c675861623f..d8e4219c2324 100644 --- a/drivers/ssb/Kconfig +++ b/drivers/ssb/Kconfig @@ -83,6 +83,7 @@ config SSB_SDIOHOST config SSB_HOST_SOC bool "Support for SSB bus on SoC" depends on SSB && BCM47XX_NVRAM + select SSB_SPROM help Host interface for a SSB directly mapped into memory. This is for some Broadcom SoCs from the BCM47xx and BCM53xx lines. |