diff options
| author |   Joel Stanley <joel@jms.id.au> | 2019-06-26 11:33:56 +0930 |
|---|---|---|
| committer |   Olof Johansson <olof@lixom.net> | 2019-06-26 19:10:30 -0700 |
| commit | 8bb564b102bd0593e0d11f200b30756c8ca0fc0e (patch) | |
| tree | 61f26570e28c10164e94ada541c81c8e021a103d /arch/arm/configs | |
| parent | Merge tag 'sunxi-config64-for-5.3-201906210813' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/defconfig (diff) | |
| download | linux-dev-8bb564b102bd0593e0d11f200b30756c8ca0fc0e.tar.xz linux-dev-8bb564b102bd0593e0d11f200b30756c8ca0fc0e.zip | |
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>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/multi_v5_defconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/configs/multi_v5_defconfig b/arch/arm/configs/multi_v5_defconfig index c3026001f8c3..201237002c65 100644 --- 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 |