From c0ea07f4028981564944d9b9d7fe1d5c7e41451d Mon Sep 17 00:00:00 2001 From: Jan Luebbe Date: Wed, 24 Feb 2016 16:03:18 +0100 Subject: ARM: multi_v5_defconfig: Cleanup multi_v5_defconfig Regenerate multi_v5_defconfig by running: make multi_v5_defconfig make savedefconfig mv defconfig arch/arm/configs/multi_v5_defconfig Signed-off-by: Jan Luebbe Signed-off-by: Michael Grzeschik Signed-off-by: Arnd Bergmann --- arch/arm/configs/multi_v5_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/configs/multi_v5_defconfig') diff --git a/arch/arm/configs/multi_v5_defconfig b/arch/arm/configs/multi_v5_defconfig index 1f9ca4737ef6..fcbc633ef991 100644 --- a/arch/arm/configs/multi_v5_defconfig +++ b/arch/arm/configs/multi_v5_defconfig @@ -97,9 +97,9 @@ CONFIG_NET_DSA_MV88E6352=y CONFIG_MV643XX_ETH=y CONFIG_R8169=y CONFIG_MARVELL_PHY=y -CONFIG_MWL8K=m CONFIG_LIBERTAS=y CONFIG_LIBERTAS_SDIO=y +CONFIG_MWL8K=m CONFIG_INPUT_EVDEV=y CONFIG_KEYBOARD_GPIO=y # CONFIG_INPUT_MOUSE is not set -- cgit From bd3d4f538561cb47bb82bbf31c79afe3b10e243e Mon Sep 17 00:00:00 2001 From: Jan Luebbe Date: Wed, 24 Feb 2016 16:03:19 +0100 Subject: ARM: multi_v5_defconfig: Enable initramfs support This makes it possible to automatically boot-test this defconfig with kernelci.org. Signed-off-by: Jan Luebbe Signed-off-by: Michael Grzeschik Signed-off-by: Arnd Bergmann --- arch/arm/configs/multi_v5_defconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/arm/configs/multi_v5_defconfig') diff --git a/arch/arm/configs/multi_v5_defconfig b/arch/arm/configs/multi_v5_defconfig index fcbc633ef991..ab503c2c8cdd 100644 --- a/arch/arm/configs/multi_v5_defconfig +++ b/arch/arm/configs/multi_v5_defconfig @@ -2,6 +2,7 @@ CONFIG_SYSVIPC=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_LOG_BUF_SHIFT=19 +CONFIG_BLK_DEV_INITRD=y CONFIG_PROFILING=y CONFIG_OPROFILE=y CONFIG_KPROBES=y -- cgit