summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@iki.fi>2018-11-11 00:06:12 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-11-27 16:10:50 +0100
commit2fc77700daa9f2faf7e61f46c1d784fd85867dfc (patch)
treec084f0e3ba633150aa7c91be3c47e5f1ee3572a2
parent817266cb8d45b74a695fb8a27e12b17cf087d7b1 (diff)
downloadlinux-stable-2fc77700daa9f2faf7e61f46c1d784fd85867dfc.tar.gz
linux-stable-2fc77700daa9f2faf7e61f46c1d784fd85867dfc.tar.bz2
linux-stable-2fc77700daa9f2faf7e61f46c1d784fd85867dfc.zip
MIPS: OCTEON: cavium_octeon_defconfig: re-enable OCTEON USB driver
commit 82fba2df7f7c019627f24c5036dc99f41731d770 upstream. Re-enable OCTEON USB driver which is needed on older hardware (e.g. EdgeRouter Lite) for mass storage etc. This got accidentally deleted when config options were changed for OCTEON2/3 USB. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Paul Burton <paul.burton@mips.com> Fixes: f922bc0ad08b ("MIPS: Octeon: cavium_octeon_defconfig: Enable more drivers") Patchwork: https://patchwork.linux-mips.org/patch/21077/ Cc: Ralf Baechle <ralf@linux-mips.org> Cc: James Hogan <jhogan@kernel.org> Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Cc: stable@vger.kernel.org # 4.14+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/mips/configs/cavium_octeon_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/configs/cavium_octeon_defconfig b/arch/mips/configs/cavium_octeon_defconfig
index 490b12af103c..c52d0efacd14 100644
--- a/arch/mips/configs/cavium_octeon_defconfig
+++ b/arch/mips/configs/cavium_octeon_defconfig
@@ -140,6 +140,7 @@ CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_DS1307=y
CONFIG_STAGING=y
CONFIG_OCTEON_ETHERNET=y
+CONFIG_OCTEON_USB=y
# CONFIG_IOMMU_SUPPORT is not set
CONFIG_RAS=y
CONFIG_EXT4_FS=y