diff options
| author | Jan Luebbe <jlu@pengutronix.de> | 2016-02-24 16:03:18 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-02-26 22:44:45 +0100 |
| commit | c0ea07f4028981564944d9b9d7fe1d5c7e41451d (patch) | |
| tree | e49b9d8e08a737730ca1b2fac7832f90f437e116 /arch/arm/configs/multi_v5_defconfig | |
| parent | 4736af67824f286991ea5df8250da6a83fa5fb1c (diff) | |
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 <jlu@pengutronix.de>
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs/multi_v5_defconfig')
| -rw-r--r-- | arch/arm/configs/multi_v5_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
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 |