From 111b1007f5120a5e50cdbc08a076e6bdc02403fd Mon Sep 17 00:00:00 2001 From: Shawn Guo Date: Tue, 23 Oct 2012 15:23:59 +0800 Subject: [PATCH] --- yaml --- r: 339768 b: refs/heads/master c: 68b25325a7fd290b5e472bba0df9cbe8c1a81d8f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-imx/Kconfig | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 52e0ccb2b35c..b3da875ecdd3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4cc3c840cb71da9a8e458bf89677a78ea0d61532 +refs/heads/master: 68b25325a7fd290b5e472bba0df9cbe8c1a81d8f diff --git a/trunk/arch/arm/mach-imx/Kconfig b/trunk/arch/arm/mach-imx/Kconfig index 66bcf1df14b9..f1bf610e2900 100644 --- a/trunk/arch/arm/mach-imx/Kconfig +++ b/trunk/arch/arm/mach-imx/Kconfig @@ -72,7 +72,7 @@ config HAVE_IMX_MMDC bool config HAVE_IMX_SRC - bool + def_bool y if SMP config IMX_HAVE_IOMUX_V1 bool @@ -837,7 +837,6 @@ config SOC_IMX6Q select HAVE_CAN_FLEXCAN if CAN select HAVE_IMX_GPC select HAVE_IMX_MMDC - select HAVE_IMX_SRC select HAVE_SMP select MFD_SYSCON select PINCTRL