aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/configs/hp300_defconfig
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2015-02-23 05:08:58 -0500
committerGeert Uytterhoeven <geert@linux-m68k.org>2015-03-15 05:24:48 -0400
commit378690e3702fd4e45a5f07be527328b63d743b42 (patch)
treea7e7818d55775e04bcf4782cb63b7919784a3778 /arch/m68k/configs/hp300_defconfig
parentbb3723a5e4a75f540c64a33481bef2709bf46544 (diff)
m68k/defconfig: Update defconfigs for v4.0-rc1
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/configs/hp300_defconfig')
-rw-r--r--arch/m68k/configs/hp300_defconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig
index 9f9793fb2b73..49ae3376e993 100644
--- a/arch/m68k/configs/hp300_defconfig
+++ b/arch/m68k/configs/hp300_defconfig
@@ -481,8 +481,10 @@ CONFIG_NLS_MAC_TURKISH=m
481CONFIG_DLM=m 481CONFIG_DLM=m
482CONFIG_MAGIC_SYSRQ=y 482CONFIG_MAGIC_SYSRQ=y
483CONFIG_ASYNC_RAID6_TEST=m 483CONFIG_ASYNC_RAID6_TEST=m
484CONFIG_TEST_HEXDUMP=m
484CONFIG_TEST_STRING_HELPERS=m 485CONFIG_TEST_STRING_HELPERS=m
485CONFIG_TEST_KSTRTOX=m 486CONFIG_TEST_KSTRTOX=m
487CONFIG_TEST_RHASHTABLE=m
486CONFIG_TEST_LKM=m 488CONFIG_TEST_LKM=m
487CONFIG_TEST_USER_COPY=m 489CONFIG_TEST_USER_COPY=m
488CONFIG_TEST_BPF=m 490CONFIG_TEST_BPF=m
@@ -533,5 +535,6 @@ CONFIG_CRYPTO_DRBG_HASH=y
533CONFIG_CRYPTO_DRBG_CTR=y 535CONFIG_CRYPTO_DRBG_CTR=y
534CONFIG_CRYPTO_USER_API_HASH=m 536CONFIG_CRYPTO_USER_API_HASH=m
535CONFIG_CRYPTO_USER_API_SKCIPHER=m 537CONFIG_CRYPTO_USER_API_SKCIPHER=m
538CONFIG_CRYPTO_USER_API_RNG=m
536# CONFIG_CRYPTO_HW is not set 539# CONFIG_CRYPTO_HW is not set
537CONFIG_XZ_DEC_TEST=m 540CONFIG_XZ_DEC_TEST=m