git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'char-misc-4.20-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
configs
/
cavium_octeon_defconfig
diff --git
a/arch/mips/configs/cavium_octeon_defconfig
b/arch/mips/configs/cavium_octeon_defconfig
index 490b12af103c1285043ecfec912b1839c5586f06..c52d0efacd1466f0320a025d3519ffb8ba212a09 100644
(file)
--- 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