From 6212377a901600d622bd7c8f802f28794de8ba6a Mon Sep 17 00:00:00 2001
From: Gregory CLEMENT <gregory.clement@free-electrons.com>
Date: Fri, 25 Jan 2013 18:32:43 +0100
Subject: [PATCH] --- yaml --- r: 359918 b: refs/heads/master c:
 cecf42c5d7a864509ee5cc6630d2414676f0b8a9 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/arm/configs/mvebu_defconfig | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 95c0516a8ce1..14491051a807 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ddd3f69f9f01063edabeb8ca5b1551936f98dfb1
+refs/heads/master: cecf42c5d7a864509ee5cc6630d2414676f0b8a9
diff --git a/trunk/arch/arm/configs/mvebu_defconfig b/trunk/arch/arm/configs/mvebu_defconfig
index 28e3332ede74..4476a3014a72 100644
--- a/trunk/arch/arm/configs/mvebu_defconfig
+++ b/trunk/arch/arm/configs/mvebu_defconfig
@@ -14,7 +14,6 @@ CONFIG_MACH_ARMADA_XP=y
 # CONFIG_CACHE_L2X0 is not set
 # CONFIG_SWP_EMULATE is not set
 CONFIG_SMP=y
-# CONFIG_LOCAL_TIMERS is not set
 CONFIG_AEABI=y
 CONFIG_HIGHMEM=y
 # CONFIG_COMPACTION is not set