From patchwork Thu Mar 17 05:01:09 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Rigby X-Patchwork-Id: 643 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:44:19 -0000 Delivered-To: patches@linaro.org Received: by 10.151.46.5 with SMTP id y5cs28977ybj; Wed, 16 Mar 2011 22:01:46 -0700 (PDT) Received: by 10.150.61.13 with SMTP id j13mr952129yba.180.1300338105574; Wed, 16 Mar 2011 22:01:45 -0700 (PDT) Received: from mail-yi0-f50.google.com (mail-yi0-f50.google.com [209.85.218.50]) by mx.google.com with ESMTPS id q16si4445946ybk.61.2011.03.16.22.01.43 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 16 Mar 2011 22:01:44 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.218.50 is neither permitted nor denied by best guess record for domain of john.rigby@linaro.org) client-ip=209.85.218.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.218.50 is neither permitted nor denied by best guess record for domain of john.rigby@linaro.org) smtp.mail=john.rigby@linaro.org Received: by yie30 with SMTP id 30so1178858yie.37 for ; Wed, 16 Mar 2011 22:01:43 -0700 (PDT) Received: by 10.151.16.4 with SMTP id t4mr1004254ybi.103.1300338103468; Wed, 16 Mar 2011 22:01:43 -0700 (PDT) Received: from localhost.localdomain (c-76-23-54-220.hsd1.ut.comcast.net [76.23.54.220]) by mx.google.com with ESMTPS id z10sm1038691yhc.47.2011.03.16.22.01.40 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 16 Mar 2011 22:01:42 -0700 (PDT) From: John Rigby To: Linus Walleij , Nicolas Pitre , patches@linaro.org Cc: John Rigby Subject: [PATCH] mach-ux500: fix build error Date: Wed, 16 Mar 2011 23:01:09 -0600 Message-Id: <1300338069-11345-1-git-send-email-john.rigby@linaro.org> X-Mailer: git-send-email 1.7.1 the commit: mach-ux500: basic HREFv60 support v2 u8500_init_machine was changed to mop500_init_machine and 2 of 3 uses instances of .init_machine were changed. Fix the 3rd one. Signed-off-by: John Rigby --- arch/arm/mach-ux500/board-mop500.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 7b3ff00..f5590a8 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -434,5 +434,5 @@ MACHINE_START(NOMADIK, "ST-Ericsson MOP500 platform") .init_irq = ux500_init_irq, /* we re-use nomadik timer here */ .timer = &ux500_timer, - .init_machine = u8500_init_machine, + .init_machine = mop500_init_machine, MACHINE_END