summaryrefslogtreecommitdiff
path: root/arch/arm/configs/versatile_defconfig
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-11-14 01:25:38 +0400
committerTony Lindgren <tony@atomide.com>2012-11-14 01:25:38 +0400
commit89ab216b33ba9405880fd3d89531305a931bc70f (patch)
tree8f6428ce51ecaed6f6e1379c036dbe341eb71e34 /arch/arm/configs/versatile_defconfig
parentc9d501e5cb0238910337213e12a09127221c35d8 (diff)
parent46bf4a562207c5ebd24e1dde5e5ee326cd3d6b91 (diff)
downloadlinux-89ab216b33ba9405880fd3d89531305a931bc70f.tar.xz
Merge branch 'omap-for-v3.8/pm' into omap-for-v3.8/clock
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