From patchwork Sat Jan 5 16:37:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 1936461 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 094E3DFB7E for ; Sat, 5 Jan 2013 16:41:39 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TrWkd-00026c-OC; Sat, 05 Jan 2013 16:37:39 +0000 Received: from mail-pa0-f53.google.com ([209.85.220.53]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TrWka-00026M-5h for linux-arm-kernel@lists.infradead.org; Sat, 05 Jan 2013 16:37:36 +0000 Received: by mail-pa0-f53.google.com with SMTP id hz1so9857428pad.40 for ; Sat, 05 Jan 2013 08:37:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=SYvBovliOsKzEuOsQ+WEAKrV6TsGYxBBpeKPFJdbOeE=; b=O1AamQNVUNFH0zp1K2qtPZ6YDxVHCysX7zafiAtU+iVvmMs6s5djoAI1UuLgZNpu1P IoxgtO1M+Nnj4I+vcOSaiBLULYNs+hyROuM8gc3Utrj8WepbtDqJvsZ7cSpJiiNdJ60Z 6IfXl3U0ceILnVvpZxm7Aea4g7cYRSfCsVcsr1rpWu92E/8inqYx/wSDK3ldd+iiPjnp a2baUwJpqfjwDAmjDQaxFphlEV1o2TKmlJ4/cC1qiT1adtP5dKly6tJipLuYzBxE56tq joQkVjmHdMwAk76ccF0su5Mb/xaE9oyE480Kye6H+UVg7Hcf9kaYadndSGLdt5tUcUY4 y9Sg== X-Received: by 10.66.73.105 with SMTP id k9mr164105679pav.37.1357403852860; Sat, 05 Jan 2013 08:37:32 -0800 (PST) Received: from quad.lixom.net (173-13-129-225-sfba.hfc.comcastbusiness.net. [173.13.129.225]) by mx.google.com with ESMTPS id is3sm34324516pbc.6.2013.01.05.08.37.31 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 05 Jan 2013 08:37:31 -0800 (PST) From: Olof Johansson To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: clps711x: Fix bad merge of clockevents setup Date: Sat, 5 Jan 2013 08:37:33 -0800 Message-Id: <1357403853-29620-1-git-send-email-olof@lixom.net> X-Mailer: git-send-email 1.7.10.1.488.g05fbf7a X-Gm-Message-State: ALoCoQlb1cyHLOt0oYznu/K71uX63EWCUZdohM+YJw5Do+wockpRs4gechndnkevv66phXPJF9N5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130105_113736_400138_A112F697 X-CRM114-Status: UNSURE ( 9.60 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.220.53 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Olof Johansson , linux@arm.linux.org.uk, Alexander Shiyan X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org I mismerged a previous branch from Alexander, and accidentally left in ARCH_USES_GETTIMEOFFSET. Remove it. Signed-off-by: Olof Johansson Cc: Alexander Shiyan --- I have applied this to the fixes branch and will include in the next upstream pull request. arch/arm/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index f95ba14..ab864d9 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -371,7 +371,6 @@ config ARCH_CNS3XXX config ARCH_CLPS711X bool "Cirrus Logic CLPS711x/EP721x/EP731x-based" select ARCH_REQUIRE_GPIOLIB - select ARCH_USES_GETTIMEOFFSET select AUTO_ZRELADDR select CLKDEV_LOOKUP select COMMON_CLK