From patchwork Sun Jan 13 15:50:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joachim Eastwood X-Patchwork-Id: 1970031 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 86A8ADF280 for ; Sun, 13 Jan 2013 15:55:23 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TuPpy-0007I7-UA; Sun, 13 Jan 2013 15:51:07 +0000 Received: from mail-lb0-f174.google.com ([209.85.217.174]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TuPpv-0007Ho-3W for linux-arm-kernel@lists.infradead.org; Sun, 13 Jan 2013 15:51:04 +0000 Received: by mail-lb0-f174.google.com with SMTP id gi11so2334902lbb.5 for ; Sun, 13 Jan 2013 07:50:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=2nwYgpZerPuQiDOAVryCz2LYIi5Y9G+RFDnNichLw5g=; b=rjErRveGipyNygPc7XWNY1iZs2zxqgTHp9NxN23AjHrJg16rgQsza4pbSKvzU0kSom R8ztBX30OwXSbcN/C76MaffRpbrd1viQHSeygXE8vgSizj6hs/rI1z5ftb/iLE2Pr029 Q4/dneZ/JR1CMcP5Gqfnh8Sbik7Y/7QghE4F3kL65lPjIwxkr9EsiMQ4hMSdi1Gsxzxy NC/gpQheFdE8oqhLrybONDkyajXX/hTKElimGE4JV8ICnJRa1mHd0FJzeejsj0JkbLAi 5qm00d8YINrxGrDmyfdNama6YXrX7nFDWBuh9LPyUnnyspsx63UxujUeBXES4th9vhUg KcNA== X-Received: by 10.152.111.72 with SMTP id ig8mr78278306lab.1.1358092258353; Sun, 13 Jan 2013 07:50:58 -0800 (PST) Received: from localhost.localdomain ([90.149.223.57]) by mx.google.com with ESMTPS id to7sm4119917lab.13.2013.01.13.07.50.56 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 13 Jan 2013 07:50:57 -0800 (PST) From: Joachim Eastwood To: swarren@nvidia.com, plagnioj@jcrosoft.com, nicolas.ferre@atmel.com Subject: [PATCH] ARM: at91: fix board-rm9200-dt after sys_timer conversion Date: Sun, 13 Jan 2013 16:50:47 +0100 Message-Id: <1358092247-20318-1-git-send-email-manabian@gmail.com> X-Mailer: git-send-email 1.8.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130113_105103_372726_6FF92319 X-CRM114-Status: GOOD ( 12.39 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (manabian[at]gmail.com) -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.217.174 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Joachim Eastwood , linux-arm-kernel@lists.infradead.org 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 After "ARM: delete struct sys_timer" board-rm9200-dt fails compilation with the following error: CC arch/arm/mach-at91/board-rm9200-dt.o arch/arm/mach-at91/board-rm9200-dt.c:50:2: error: unknown field 'timer' specified in initializer arch/arm/mach-at91/board-rm9200-dt.c:50:13: error: 'at91rm9200_timer' undeclared here (not in a function) make[1]: *** [arch/arm/mach-at91/board-rm9200-dt.o] Error 1 make: *** [arch/arm/mach-at91] Error 2 This is a fall out from the timer conversion. Fix it by converting board-rm9200-dt to use new timer init function as well. Signed-off-by: Joachim Eastwood --- Hi Stephen, Feel free to fold this fix into your patch if it's possible. regards Joachim Eastwood arch/arm/mach-at91/board-rm9200-dt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-at91/board-rm9200-dt.c b/arch/arm/mach-at91/board-rm9200-dt.c index 5f9ce3d..3fcb662 100644 --- a/arch/arm/mach-at91/board-rm9200-dt.c +++ b/arch/arm/mach-at91/board-rm9200-dt.c @@ -47,7 +47,7 @@ static const char *at91rm9200_dt_board_compat[] __initdata = { }; DT_MACHINE_START(at91rm9200_dt, "Atmel AT91RM9200 (Device Tree)") - .timer = &at91rm9200_timer, + .init_time = at91rm9200_timer_init, .map_io = at91_map_io, .handle_irq = at91_aic_handle_irq, .init_early = at91rm9200_dt_initialize,