From patchwork Wed Aug 10 10:13:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Martin X-Patchwork-Id: 3341 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 1CE3723F46 for ; Wed, 10 Aug 2011 10:13:59 +0000 (UTC) Received: from mail-qy0-f180.google.com (mail-qy0-f180.google.com [209.85.216.180]) by fiordland.canonical.com (Postfix) with ESMTP id DFDB4A182B4 for ; Wed, 10 Aug 2011 10:13:58 +0000 (UTC) Received: by mail-qy0-f180.google.com with SMTP id 31so626002qyk.11 for ; Wed, 10 Aug 2011 03:13:58 -0700 (PDT) Received: by 10.229.42.10 with SMTP id q10mr3367491qce.45.1312971238640; Wed, 10 Aug 2011 03:13:58 -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.229.190.71 with SMTP id dh7cs74593qcb; Wed, 10 Aug 2011 03:13:58 -0700 (PDT) Received: from mr.google.com ([10.216.67.134]) by 10.216.67.134 with SMTP id j6mr7367222wed.0.1312971238334 (num_hops = 1); Wed, 10 Aug 2011 03:13:58 -0700 (PDT) Received: by 10.216.67.134 with SMTP id j6mr5136986wed.0.1312971237065; Wed, 10 Aug 2011 03:13:57 -0700 (PDT) Received: from mail-wy0-f178.google.com (mail-wy0-f178.google.com [74.125.82.178]) by mx.google.com with ESMTPS id l60si1981191weq.140.2011.08.10.03.13.56 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 10 Aug 2011 03:13:57 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of dave.martin@linaro.org) client-ip=74.125.82.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of dave.martin@linaro.org) smtp.mail=dave.martin@linaro.org Received: by mail-wy0-f178.google.com with SMTP id 19so714179wyg.37 for ; Wed, 10 Aug 2011 03:13:56 -0700 (PDT) Received: by 10.227.11.75 with SMTP id s11mr6484509wbs.10.1312971236283; Wed, 10 Aug 2011 03:13:56 -0700 (PDT) Received: from e200948.peterhouse.linaro.org (fw-lnat.cambridge.arm.com [217.140.96.63]) by mx.google.com with ESMTPS id fr7sm627419wbb.22.2011.08.10.03.13.54 (version=SSLv3 cipher=OTHER); Wed, 10 Aug 2011 03:13:55 -0700 (PDT) From: Dave Martin To: linux-arm-kernel@lists.infradead.org Cc: patches@linaro.org, Ben Dooks , Kukjin Kim , Nicolas Pitre , Jon Medhurst Subject: [RFC PATCH 2/5] ARM: s3c24xx: Reference cpu_architecture as a global variable Date: Wed, 10 Aug 2011 11:13:40 +0100 Message-Id: <1312971223-28165-3-git-send-email-dave.martin@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1312971223-28165-1-git-send-email-dave.martin@linaro.org> References: <1312971223-28165-1-git-send-email-dave.martin@linaro.org> This patch is needed for compatibility with the change of cpu_architecture from a function to a global variable. Since cpu_architecture is ARM-specific, also add an explicit include for rather than relying on this being included as a side-effect. Signed-off-by: Dave Martin --- arch/arm/plat-s3c24xx/cpu.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/arch/arm/plat-s3c24xx/cpu.c b/arch/arm/plat-s3c24xx/cpu.c index c1fc6c6..bc118dc 100644 --- a/arch/arm/plat-s3c24xx/cpu.c +++ b/arch/arm/plat-s3c24xx/cpu.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include @@ -221,7 +222,7 @@ void __init s3c24xx_init_io(struct map_desc *mach_desc, int size) iotable_init(mach_desc, size); iotable_init(s3c_iodesc, ARRAY_SIZE(s3c_iodesc)); - if (cpu_architecture() >= CPU_ARCH_ARMv5) { + if (cpu_architecture >= CPU_ARCH_ARMv5) { idcode = s3c24xx_read_idcode_v5(); } else { idcode = s3c24xx_read_idcode_v4();