summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-11-11 17:03:25 +0100
committerShawn Guo <shawn.guo@linaro.org>2014-11-23 14:57:10 +0800
commitcfd074ad860016d3aafd28a06b03d575d17aac0a (patch)
treef45766c940d3e51ff0f61267529774db72bb15bc /arch/arm/mach-imx
parenta41820d690379a4eb4b72a3ddd553aac7ed4eb6a (diff)
ARM: imx: temporarily remove CONFIG_SOC_FSL from LS1021A
The newly introduced LS1021A SoC selects CONFIG_SOC_FSL, which is originally symbol used for the PowerPC based platforms and guards lots of code that does not build on ARM. This breaks allmodconfig, so let's remove it for now, until either all those drivers are fixed or they use a dependency on IMX instead. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/mach-imx')
-rw-r--r--arch/arm/mach-imx/Kconfig4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index ef549ef1cd6..e8627e04e1e 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -658,14 +658,10 @@ choice
endchoice
-config FSL_SOC
- bool
-
config SOC_LS1021A
bool "Freescale LS1021A support"
select ARM_GIC
select HAVE_ARM_ARCH_TIMER
- select FSL_SOC
select PCI_DOMAINS if PCI
select ZONE_DMA if ARM_LPAE