diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2015-04-13 10:03:32 -0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2015-04-13 10:03:32 -0400 |
| commit | 3e20a26b02bd4f24945c87407df51948dd488620 (patch) | |
| tree | f466d3b2a47a98ec2910724e17ee2f3a93c1a49e /drivers/ssb | |
| parent | 98b0429b7abd5c05efdb23f3eba02ec3f696748e (diff) | |
| parent | 5306a5450824691e27d68f711758515debedeeac (diff) | |
Merge branch '4.0-fixes' into mips-for-linux-next
Diffstat (limited to 'drivers/ssb')
| -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 75b3603906c1..f0d22cdb51cd 100644 --- a/drivers/ssb/Kconfig +++ b/drivers/ssb/Kconfig | |||
| @@ -130,6 +130,7 @@ config SSB_DRIVER_MIPS | |||
| 130 | bool "SSB Broadcom MIPS core driver" | 130 | bool "SSB Broadcom MIPS core driver" |
| 131 | depends on SSB && MIPS | 131 | depends on SSB && MIPS |
| 132 | select SSB_SERIAL | 132 | select SSB_SERIAL |
| 133 | select SSB_SFLASH | ||
| 133 | help | 134 | help |
| 134 | Driver for the Sonics Silicon Backplane attached | 135 | Driver for the Sonics Silicon Backplane attached |
| 135 | Broadcom MIPS core. | 136 | Broadcom MIPS core. |