diff options
author | Scott Wood <scottwood@freescale.com> | 2014-09-16 20:47:00 -0400 |
---|---|---|
committer | Scott Wood <scottwood@freescale.com> | 2014-09-19 16:00:08 -0400 |
commit | 94105a762016aea3284c07c813017b90a6325f10 (patch) | |
tree | 771af017c903ef9a20b09ac07055847db7b402b0 | |
parent | c22b47f03cdf01c7c4859b818b2a413251dde28d (diff) |
powerpc/85xx/defconfig: Remove duplicate CONFIG_RTC_DRV_DS1307
Commit a95e8c28b3dc "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: a95e8c28b3dc "powerpc/defconfig: update RTC support"
Cc: Shengzhou Liu <Shengzhou.Liu@freescale.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
-rw-r--r-- | arch/powerpc/configs/mpc85xx_defconfig | 1 | ||||
-rw-r--r-- | arch/powerpc/configs/mpc85xx_smp_defconfig | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig index 8b2d759e69f6..d2c415489f72 100644 --- a/arch/powerpc/configs/mpc85xx_defconfig +++ b/arch/powerpc/configs/mpc85xx_defconfig | |||
@@ -213,7 +213,6 @@ CONFIG_RTC_DRV_DS1307=y | |||
213 | CONFIG_RTC_DRV_DS1374=y | 213 | CONFIG_RTC_DRV_DS1374=y |
214 | CONFIG_RTC_DRV_DS3232=y | 214 | CONFIG_RTC_DRV_DS3232=y |
215 | CONFIG_RTC_DRV_CMOS=y | 215 | CONFIG_RTC_DRV_CMOS=y |
216 | CONFIG_RTC_DRV_DS1307=y | ||
217 | CONFIG_DMADEVICES=y | 216 | CONFIG_DMADEVICES=y |
218 | CONFIG_FSL_DMA=y | 217 | CONFIG_FSL_DMA=y |
219 | # CONFIG_NET_DMA is not set | 218 | # CONFIG_NET_DMA is not set |
diff --git a/arch/powerpc/configs/mpc85xx_smp_defconfig b/arch/powerpc/configs/mpc85xx_smp_defconfig index a3003b2e29f8..87460083dbc7 100644 --- a/arch/powerpc/configs/mpc85xx_smp_defconfig +++ b/arch/powerpc/configs/mpc85xx_smp_defconfig | |||
@@ -214,7 +214,6 @@ CONFIG_RTC_DRV_DS1307=y | |||
214 | CONFIG_RTC_DRV_DS1374=y | 214 | CONFIG_RTC_DRV_DS1374=y |
215 | CONFIG_RTC_DRV_DS3232=y | 215 | CONFIG_RTC_DRV_DS3232=y |
216 | CONFIG_RTC_DRV_CMOS=y | 216 | CONFIG_RTC_DRV_CMOS=y |
217 | CONFIG_RTC_DRV_DS1307=y | ||
218 | CONFIG_DMADEVICES=y | 217 | CONFIG_DMADEVICES=y |
219 | CONFIG_FSL_DMA=y | 218 | CONFIG_FSL_DMA=y |
220 | # CONFIG_NET_DMA is not set | 219 | # CONFIG_NET_DMA is not set |