From patchwork Wed Jan 4 10:21:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 6044 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 0B59923E13 for ; Wed, 4 Jan 2012 10:21:53 +0000 (UTC) Received: from mail-ey0-f180.google.com (mail-ey0-f180.google.com [209.85.215.180]) by fiordland.canonical.com (Postfix) with ESMTP id E64ECA1812B for ; Wed, 4 Jan 2012 10:21:52 +0000 (UTC) Received: by eaac11 with SMTP id c11so16521072eaa.11 for ; Wed, 04 Jan 2012 02:21:52 -0800 (PST) Received: by 10.205.141.78 with SMTP id jd14mr12643867bkc.107.1325672512685; Wed, 04 Jan 2012 02:21:52 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.205.82.144 with SMTP id ac16cs364700bkc; Wed, 4 Jan 2012 02:21:52 -0800 (PST) Received: by 10.152.148.227 with SMTP id tv3mr26642188lab.15.1325672510955; Wed, 04 Jan 2012 02:21:50 -0800 (PST) Received: from mail.df.lth.se (mail.df.lth.se. [194.47.250.12]) by mx.google.com with ESMTPS id ip8si43960972lab.1.2012.01.04.02.21.50 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 04 Jan 2012 02:21:50 -0800 (PST) Received-SPF: neutral (google.com: 194.47.250.12 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=194.47.250.12; Authentication-Results: mx.google.com; spf=neutral (google.com: 194.47.250.12 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) smtp.mail=linus.walleij@linaro.org Received: from Fecusia (c83-249-216-194.bredband.comhem.se [83.249.216.194]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.df.lth.se (Postfix) with ESMTPSA id 6E30965D55; Wed, 4 Jan 2012 11:21:48 +0100 (CET) Received: by Fecusia (sSMTP sendmail emulation); Wed, 4 Jan 2012 11:21:46 +0100 From: Linus Walleij To: linux-arm-kernel@lists.infradead.org Cc: Linus Walleij , Kristoffer Ericson , Marc Zyngier Subject: [PATCH 1/2] mach-sa1100: fix sched_clock breakage Date: Wed, 4 Jan 2012 11:21:43 +0100 Message-Id: <1325672503-16690-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.7.6.4 Fixed up a simple typo in the runtime sched_clock conversion so we compile again. Cc: Kristoffer Ericson Cc: Marc Zyngier Signed-off-by: Linus Walleij --- arch/arm/mach-sa1100/time.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-sa1100/time.c b/arch/arm/mach-sa1100/time.c index 1ee6d4c..69e3353 100644 --- a/arch/arm/mach-sa1100/time.c +++ b/arch/arm/mach-sa1100/time.c @@ -19,7 +19,7 @@ #include #include -static u32 notrace sa100_read_sched_clock(void) +static u32 notrace sa1100_read_sched_clock(void) { return OSCR; }