summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-spear/Kconfig
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-10-13 17:14:17 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-10-13 17:14:17 +0100
commit244acb1ba3777c2eb4d33ddc246cab5419656442 (patch)
treed2fa55c9f789afb9b1aff57067be1f9190ffc9e7 /arch/arm/plat-spear/Kconfig
parentcb8db5d4578ac9d996200ab59aa655344d305f5b (diff)
parent93e22567a138783202143c3af70d701a3ad20629 (diff)
downloadlinux-244acb1ba3777c2eb4d33ddc246cab5419656442.tar.bz2
Merge branch 'config' into late-for-linus
Diffstat (limited to 'arch/arm/plat-spear/Kconfig')
-rw-r--r--arch/arm/plat-spear/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-spear/Kconfig b/arch/arm/plat-spear/Kconfig
index 4404f82d5979..f8db7b2deb36 100644
--- a/arch/arm/plat-spear/Kconfig
+++ b/arch/arm/plat-spear/Kconfig
@@ -12,10 +12,10 @@ config ARCH_SPEAR13XX
bool "ST SPEAr13xx with Device Tree"
select ARM_GIC
select CPU_V7
- select USE_OF
select HAVE_SMP
select MIGHT_HAVE_CACHE_L2X0
select PINCTRL
+ select USE_OF
help
Supports for ARM's SPEAR13XX family
@@ -23,8 +23,8 @@ config ARCH_SPEAR3XX
bool "ST SPEAr3xx with Device Tree"
select ARM_VIC
select CPU_ARM926T
- select USE_OF
select PINCTRL
+ select USE_OF
help
Supports for ARM's SPEAR3XX family