From: Jan Luebbe <jlu@pengutronix.de>
Date: Wed, 24 Feb 2016 15:03:18 +0000 (+0100)
Subject: ARM: multi_v5_defconfig: Cleanup multi_v5_defconfig
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c0ea07f4028981564944d9b9d7fe1d5c7e41451d;p=linux-beck.git

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>
---

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