Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94105a76 authored by Scott Wood's avatar Scott Wood
Browse files

powerpc/85xx/defconfig: Remove duplicate CONFIG_RTC_DRV_DS1307 



Commit a95e8c28 "powerpc/defconfig: update RTC support" duplicated
the CONFIG_RTC_DRV_DS1307 symbol in mpc85xx_defconfig and
mpc85xx_smp_defconfig, resulting in this:

arch/powerpc/configs/mpc85xx_smp_defconfig:217:warning: override: reassigning to symbol RTC_DRV_DS1307

Fixes: a95e8c28 "powerpc/defconfig: update RTC support"
Cc: Shengzhou Liu <Shengzhou.Liu@freescale.com>
Signed-off-by: default avatarScott Wood <scottwood@freescale.com>
parent c22b47f0

arch/powerpc/configs/mpc85xx_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -213,7 +213,6 @@ CONFIG_RTC_DRV_DS1307=y 
CONFIG_RTC_DRV_DS1374=y

CONFIG_RTC_DRV_DS3232=y

CONFIG_RTC_DRV_CMOS=y

CONFIG_RTC_DRV_DS1307=y

CONFIG_DMADEVICES=y

CONFIG_FSL_DMA=y

# CONFIG_NET_DMA is not set

arch/powerpc/configs/mpc85xx_smp_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -214,7 +214,6 @@ CONFIG_RTC_DRV_DS1307=y 
CONFIG_RTC_DRV_DS1374=y

CONFIG_RTC_DRV_DS3232=y

CONFIG_RTC_DRV_CMOS=y

CONFIG_RTC_DRV_DS1307=y

CONFIG_DMADEVICES=y

CONFIG_FSL_DMA=y

# CONFIG_NET_DMA is not set