summaryrefslogtreecommitdiffstats
path: root/arch/mips/configs/sb1250_swarm_defconfig
diff options
context:
space:
mode:
authorMaciej W. Rozycki <macro@orcam.me.uk>2021-03-21 20:55:41 +0100
committerThomas Bogendoerfer <tsbogend@alpha.franken.de>2021-03-24 10:37:49 +0100
commitd11f6aa9457129ce7385802f2e73bc9c33cfefba (patch)
tree03764c56e61e4e6d83d1591b5b0b43b0e487f6f5 /arch/mips/configs/sb1250_swarm_defconfig
parentbddeecc959b5cdecdf24df626185eeabf53dffa6 (diff)
downloadlinux-stable-d11f6aa9457129ce7385802f2e73bc9c33cfefba.tar.gz
linux-stable-d11f6aa9457129ce7385802f2e73bc9c33cfefba.tar.bz2
linux-stable-d11f6aa9457129ce7385802f2e73bc9c33cfefba.zip
MIPS: SiByte: Regenerate stale SWARM defconfig
Options have been removed and reordered since the last update, so regenerate the template so as not to interfere with actual changes. Signed-off-by: Maciej W. Rozycki <macro@orcam.me.uk> Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Diffstat (limited to 'arch/mips/configs/sb1250_swarm_defconfig')
-rw-r--r--arch/mips/configs/sb1250_swarm_defconfig9
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/mips/configs/sb1250_swarm_defconfig b/arch/mips/configs/sb1250_swarm_defconfig
index 96a94ebf05bf..d32dabb9287c 100644
--- a/arch/mips/configs/sb1250_swarm_defconfig
+++ b/arch/mips/configs/sb1250_swarm_defconfig
@@ -17,7 +17,6 @@ CONFIG_64BIT=y
CONFIG_SMP=y
CONFIG_NR_CPUS=2
CONFIG_HZ_1000=y
-CONFIG_PCI=y
CONFIG_MIPS32_O32=y
CONFIG_PM=y
CONFIG_MODULES=y
@@ -34,15 +33,13 @@ CONFIG_INET=y
CONFIG_IP_PNP=y
CONFIG_IP_PNP_DHCP=y
CONFIG_IP_PNP_BOOTP=y
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
CONFIG_TCP_MD5SIG=y
# CONFIG_IPV6 is not set
CONFIG_NETWORK_SECMARK=y
CONFIG_CFG80211=m
CONFIG_MAC80211=m
CONFIG_RFKILL=m
+CONFIG_PCI=y
CONFIG_FW_LOADER=m
CONFIG_CONNECTOR=m
CONFIG_BLK_DEV_RAM=y
@@ -85,18 +82,14 @@ CONFIG_CRYPTO_MICHAEL_MIC=m
CONFIG_CRYPTO_SHA512=m
CONFIG_CRYPTO_TGR192=m
CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_ANUBIS=m
CONFIG_CRYPTO_BLOWFISH=m
CONFIG_CRYPTO_CAMELLIA=m
CONFIG_CRYPTO_CAST5=m
CONFIG_CRYPTO_CAST6=m
CONFIG_CRYPTO_DES=m
CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_KHAZAD=m
CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_SEED=m
CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TWOFISH=m
CONFIG_CRYPTO_DEFLATE=m
CONFIG_CRYPTO_LZO=m