diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 08:24:33 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 08:24:33 -0500 |
| commit | 2e0e943436912ffe0848ece58167edfe754edb96 (patch) | |
| tree | b91919095c74742fa06e2105db6d859bee39b2b4 /arch/arm/mach-imx | |
| parent | a32737e1ca650504f172292dd344eb64c02311f3 (diff) | |
| parent | ef3a0bf5bfadbace156fa2a3b9c753df2de41df2 (diff) | |
Merge branch 'devel-stable' into for-linus
Conflicts:
arch/arm/kernel/setup.c
arch/arm/mach-shmobile/board-kota2.c
Diffstat (limited to 'arch/arm/mach-imx')
| -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 0e6f1af260b6..35a218cb5c7e 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig | |||
| @@ -596,12 +596,12 @@ comment "i.MX6 family:" | |||
| 596 | config SOC_IMX6Q | 596 | config SOC_IMX6Q |
| 597 | bool "i.MX6 Quad support" | 597 | bool "i.MX6 Quad support" |
| 598 | select ARM_GIC | 598 | select ARM_GIC |
| 599 | select CACHE_L2X0 | ||
| 600 | select CPU_V7 | 599 | select CPU_V7 |
| 601 | select HAVE_ARM_SCU | 600 | select HAVE_ARM_SCU |
| 602 | select HAVE_IMX_GPC | 601 | select HAVE_IMX_GPC |
| 603 | select HAVE_IMX_MMDC | 602 | select HAVE_IMX_MMDC |
| 604 | select HAVE_IMX_SRC | 603 | select HAVE_IMX_SRC |
| 604 | select HAVE_SMP | ||
| 605 | select USE_OF | 605 | select USE_OF |
| 606 | 606 | ||
| 607 | help | 607 | help |