diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-19 22:54:35 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-19 22:54:35 +0100 |
| commit | df0bcfe0f811a73077c06f75e440397e89ba58a4 (patch) | |
| tree | 0d59d32430f337acda23a18b2e0116a2b9dcd51f /arch/arm/mach-imx/Kconfig | |
| parent | ARM: 7233/1: ux500: remove overlapping iotable entries (diff) | |
| parent | imx6q: Remove unconditional dependency on l2x0 L2 cache support (diff) | |
| download | linux-df0bcfe0f811a73077c06f75e440397e89ba58a4.tar.xz linux-df0bcfe0f811a73077c06f75e440397e89ba58a4.zip | |
Merge branch 'arm/common-kconfig-refactor+for-rmk' of git://git.linaro.org/people/dmart/linux-2.6-arm into devel-stable
Diffstat (limited to 'arch/arm/mach-imx/Kconfig')
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index c44aa974e79c..188ecc00915b 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -596,12 +596,12 @@ comment "i.MX6 family:" config SOC_IMX6Q bool "i.MX6 Quad support" select ARM_GIC - select CACHE_L2X0 select CPU_V7 select HAVE_ARM_SCU select HAVE_IMX_GPC select HAVE_IMX_MMDC select HAVE_IMX_SRC + select HAVE_SMP select USE_OF help |