ARM: configs: multi_v5: Remove duplicate ASPEED options

A recent change mistakenly added a second copy of these two options,
which kbuild warns about:

 arch/arm/configs/multi_v5_defconfig:257:warning: override: reassigning
 to symbol ASPEED_LPC_CTRL
 arch/arm/configs/multi_v5_defconfig:258:warning: override: reassigning
 to symbol ASPEED_LPC_SNOOP

Fixes: 2d8bf3404bb0 ("ARM: configs: multi_v5: Add more ASPEED devices")
Signed-off-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Olof Johansson <olof@lixom.net>

diff --git a/arch/arm/configs/multi_v5_defconfig b/arch/arm/configs/multi_v5_defconfig
index c3026001f8c32087143bc12ad97073a81d8bfd54..201237002c65f2d69a260d3498aacaa79cceecb7 100644 (file)
--- a/arch/arm/configs/multi_v5_defconfig
+++ b/arch/arm/configs/multi_v5_defconfig
@@ -95,8 +95,6 @@ CONFIG_MTD_UBI=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_ATMEL_TCLIB=y
 CONFIG_ATMEL_SSC=m
-CONFIG_ASPEED_LPC_CTRL=m
-CONFIG_ASPEED_LPC_SNOOP=m
 CONFIG_EEPROM_AT24=y
 # CONFIG_SCSI_PROC_FS is not set
 CONFIG_BLK_DEV_SD=y