From patchwork Wed Jun 15 08:43:10 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 1910 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 A213323E51 for ; Wed, 15 Jun 2011 08:43:28 +0000 (UTC) Received: from mail-vx0-f180.google.com (mail-vx0-f180.google.com [209.85.220.180]) by fiordland.canonical.com (Postfix) with ESMTP id 69295A184B8 for ; Wed, 15 Jun 2011 08:43:28 +0000 (UTC) Received: by vxk12 with SMTP id 12so160170vxk.11 for ; Wed, 15 Jun 2011 01:43:27 -0700 (PDT) Received: by 10.52.168.65 with SMTP id zu1mr342230vdb.207.1308127407527; Wed, 15 Jun 2011 01:43:27 -0700 (PDT) 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.52.183.130 with SMTP id em2cs111902vdc; Wed, 15 Jun 2011 01:43:26 -0700 (PDT) Received: by 10.213.106.3 with SMTP id v3mr1027650ebo.40.1308127405972; Wed, 15 Jun 2011 01:43:25 -0700 (PDT) Received: from eu1sys200aog116.obsmtp.com (eu1sys200aog116.obsmtp.com [207.126.144.141]) by mx.google.com with SMTP id e44si638001eea.100.2011.06.15.01.43.17 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 15 Jun 2011 01:43:25 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.141 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.141; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.141 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) smtp.mail=linus.walleij@stericsson.com Received: from beta.dmz-us.st.com ([167.4.1.35]) (using TLSv1) by eu1sys200aob116.postini.com ([207.126.147.11]) with SMTP ID DSNKTfhwpU8WmKz4I4/b9uF/xjcYaczVJjFa@postini.com; Wed, 15 Jun 2011 08:43:25 UTC Received: from zeta.dmz-us.st.com (ns4.st.com [167.4.16.71]) by beta.dmz-us.st.com (STMicroelectronics) with ESMTP id 3FB2A41; Wed, 15 Jun 2011 08:43:16 +0000 (GMT) Received: from relay1.stm.gmessaging.net (unknown [10.230.100.17]) by zeta.dmz-us.st.com (STMicroelectronics) with ESMTP id C1DE154; Wed, 15 Jun 2011 08:43:15 +0000 (GMT) Received: from exdcvycastm003.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm003", Issuer "exdcvycastm003" (not verified)) by relay1.stm.gmessaging.net (Postfix) with ESMTPS id 638B224C2F0; Wed, 15 Jun 2011 10:43:10 +0200 (CEST) Received: from localhost.localdomain (10.230.100.153) by smtp.stericsson.com (10.230.100.1) with Microsoft SMTP Server (TLS) id 8.3.83.0; Wed, 15 Jun 2011 10:43:15 +0200 From: Linus Walleij To: Cc: Lee Jones , Linus Walleij , Deepak Saxena Subject: [PATCH] mach-ixp4xx: fix build error Date: Wed, 15 Jun 2011 10:43:10 +0200 Message-ID: <1308127390-30563-1-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.3.2 MIME-Version: 1.0 From: Linus Walleij The introduction of clocksource_mmio_init() broke ixp4xx due to a surplus ampersand - IXP4XX_OSTS is already a pointe to I/O space. Cc: Deepak Saxena Signed-off-by: Linus Walleij --- arch/arm/mach-ixp4xx/common.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c index 74ed81a..5ec2918 100644 --- a/arch/arm/mach-ixp4xx/common.c +++ b/arch/arm/mach-ixp4xx/common.c @@ -425,7 +425,7 @@ static void __init ixp4xx_clocksource_init(void) { init_sched_clock(&cd, ixp4xx_update_sched_clock, 32, ixp4xx_timer_freq); - clocksource_mmio_init(&IXP4XX_OSTS, "OSTS", ixp4xx_timer_freq, 200, 32, + clocksource_mmio_init(IXP4XX_OSTS, "OSTS", ixp4xx_timer_freq, 200, 32, clocksource_mmio_readl_up); }