summaryrefslogtreecommitdiff
path: root/arch/arm/configs/versatile_defconfig
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-10-30 22:39:02 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-10-30 22:39:02 +0400
commit31271e9aacaa3c3460cbad8ec62fb5a04a522f5b (patch)
tree815c671dac14e0e07959dc88e94c36a994f9c460 /arch/arm/configs/versatile_defconfig
parent32111abb508424d1d110fa471d940160abe251f5 (diff)
parentdc4dc36056392c0b0b1ca9e81bebff964b9297e0 (diff)
downloadlinux-31271e9aacaa3c3460cbad8ec62fb5a04a522f5b.tar.xz
Merge branch 'spi-tegra' into spi-next
Diffstat (limited to 'arch/arm/configs/versatile_defconfig')
-rw-r--r--arch/arm/configs/versatile_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/versatile_defconfig b/arch/arm/configs/versatile_defconfig
index cdd4d2bd3962..2ba9e63d0f17 100644
--- a/arch/arm/configs/versatile_defconfig
+++ b/arch/arm/configs/versatile_defconfig
@@ -1,3 +1,4 @@
+CONFIG_ARCH_VERSATILE=y
CONFIG_EXPERIMENTAL=y
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_SYSVIPC=y