From 764a0c56b471196ca647aa05dcf23bb599fbc776 Mon Sep 17 00:00:00 2001 From: Shawn Guo Date: Tue, 29 Jan 2013 23:12:59 +0800 Subject: [PATCH] --- yaml --- r: 355627 b: refs/heads/master c: 26246919329c045d8c1bd70dfebd44c54a5cf657 h: refs/heads/master i: 355625: d422259b8f9a8e73518af9db58d2a756f3a64422 355623: 9b8e1187ddec79e554edc72be87d1be68942b6fc v: v3 --- [refs] | 2 +- trunk/arch/arm/configs/imx_v6_v7_defconfig | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index db3824ab1c99..b25056456860 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f8c95fe6d9adad72fc7bce90f4ab68d119f50c5b +refs/heads/master: 26246919329c045d8c1bd70dfebd44c54a5cf657 diff --git a/trunk/arch/arm/configs/imx_v6_v7_defconfig b/trunk/arch/arm/configs/imx_v6_v7_defconfig index a225f1cec333..6039f0c44147 100644 --- a/trunk/arch/arm/configs/imx_v6_v7_defconfig +++ b/trunk/arch/arm/configs/imx_v6_v7_defconfig @@ -150,6 +150,7 @@ CONFIG_MFD_MC13XXX_I2C=y CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_DA9052=y +CONFIG_REGULATOR_ANATOP=y CONFIG_REGULATOR_MC13783=y CONFIG_REGULATOR_MC13892=y CONFIG_MEDIA_SUPPORT=y @@ -197,6 +198,7 @@ CONFIG_RTC_CLASS=y CONFIG_RTC_INTF_DEV_UIE_EMUL=y CONFIG_RTC_DRV_MC13XXX=y CONFIG_RTC_DRV_MXC=y +CONFIG_RTC_DRV_SNVS=y CONFIG_DMADEVICES=y CONFIG_IMX_SDMA=y CONFIG_MXS_DMA=y