diff options
| author |   Geert Uytterhoeven <geert@linux-m68k.org> | 2019-01-06 21:09:58 +0100 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2019-01-21 10:36:53 +0100 |
| commit | 800855ea0baeefa35892f84b64f6c10397fd43a9 (patch) | |
| tree | c41af006d72d938272bbbaa09881255b96779b2f /arch/m68k/configs/apollo_defconfig | |
| parent | m68k/atari: Avoid VLA use in atari_switches_setup() (diff) | |
| download | linux-dev-800855ea0baeefa35892f84b64f6c10397fd43a9.tar.xz linux-dev-800855ea0baeefa35892f84b64f6c10397fd43a9.zip | |
m68k/defconfig: Update defconfigs for v5.0-rc1
Actual changes:
-CONFIG_IOSCHED_DEADLINE=m
-CONFIG_BATMAN_ADV_MCAST=y
-# CONFIG_SCSI_MQ_DEFAULT is not set
+CONFIG_CRYPTO_ADIANTUM=m
+CONFIG_CRYPTO_STREEBOG=m
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/configs/apollo_defconfig')
| -rw-r--r-- | arch/m68k/configs/apollo_defconfig | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig index 3afbc0ae28c3..db0e654a88d5 100644 --- a/arch/m68k/configs/apollo_defconfig +++ b/arch/m68k/configs/apollo_defconfig @@ -34,7 +34,6 @@ CONFIG_UNIXWARE_DISKLABEL=y CONFIG_SUN_PARTITION=y # CONFIG_EFI_PARTITION is not set CONFIG_SYSV68_PARTITION=y -CONFIG_IOSCHED_DEADLINE=m CONFIG_MQ_IOSCHED_DEADLINE=m CONFIG_MQ_IOSCHED_KYBER=m CONFIG_IOSCHED_BFQ=m @@ -300,7 +299,6 @@ CONFIG_DNS_RESOLVER=y CONFIG_BATMAN_ADV=m # CONFIG_BATMAN_ADV_BATMAN_V is not set CONFIG_BATMAN_ADV_NC=y -CONFIG_BATMAN_ADV_MCAST=y CONFIG_NETLINK_DIAG=m CONFIG_MPLS=y CONFIG_NET_MPLS_GSO=m @@ -327,7 +325,6 @@ CONFIG_ATA_OVER_ETH=m CONFIG_DUMMY_IRQ=m CONFIG_RAID_ATTRS=m CONFIG_SCSI=y -# CONFIG_SCSI_MQ_DEFAULT is not set CONFIG_BLK_DEV_SD=y CONFIG_CHR_DEV_ST=m CONFIG_CHR_DEV_OSST=m @@ -540,6 +537,7 @@ CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_OFB=m CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_KEYWRAP=m +CONFIG_CRYPTO_ADIANTUM=m CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_VMAC=m CONFIG_CRYPTO_MICHAEL_MIC=m @@ -549,6 +547,7 @@ CONFIG_CRYPTO_RMD256=m CONFIG_CRYPTO_RMD320=m CONFIG_CRYPTO_SHA3=m CONFIG_CRYPTO_SM3=m +CONFIG_CRYPTO_STREEBOG=m CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_AES_TI=m |