From patchwork Thu Oct 25 05:19:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg Ungerer X-Patchwork-Id: 1641911 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 0D1373FE1C for ; Thu, 25 Oct 2012 05:16:45 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TRFmj-0005DM-16; Thu, 25 Oct 2012 05:15:13 +0000 Received: from dalsmrelay2.nai.com ([205.227.136.216]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TRFmf-0005Cw-Bg for linux-arm-kernel@lists.infradead.org; Thu, 25 Oct 2012 05:15:10 +0000 Received: from MIVEXAMER1N2.corp.nai.org (unknown [10.48.48.12]) by dalsmrelay2.nai.com with smtp id 0a7c_0097_0bc6308a_1bf8_4e12_ad4c_b45ad116e034; Thu, 25 Oct 2012 00:15:07 -0500 Received: from MIVEXAPP2N2.corp.nai.org (10.48.48.72) by MIVEXAMER1N2.corp.nai.org (10.48.48.12) with Microsoft SMTP Server (TLS) id 14.2.318.1; Thu, 25 Oct 2012 01:13:36 -0400 Received: from localhost.localdomain (10.48.48.240) by mail.na.nai.com (10.48.48.72) with Microsoft SMTP Server id 14.2.318.1; Thu, 25 Oct 2012 01:13:35 -0400 From: To: Subject: [PATCH v2] ARM: add back in KS8695 based OpenGear board entries Date: Thu, 25 Oct 2012 15:19:41 +1000 Message-ID: <1351142381-15460-1-git-send-email-gerg@snapgear.com> X-Mailer: git-send-email 1.5.5.1 MIME-Version: 1.0 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [205.227.136.216 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Greg Ungerer 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: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Greg Ungerer As of linux-3.7-rc1 configuring to build for the Micrel KS8695 based OpenGear board types will result in a build failure: CC arch/arm/mach-ks8695/board-og.o arch/arm/mach-ks8695/board-og.c:142: error: ‘MACH_TYPE_CM4002’ undeclared here (not in a function) arch/arm/mach-ks8695/board-og.c:154: error: ‘MACH_TYPE_CM4008’ undeclared here (not in a function) arch/arm/mach-ks8695/board-og.c:166: error: ‘MACH_TYPE_CM41XX’ undeclared here (not in a function) arch/arm/mach-ks8695/board-og.c:178: error: ‘MACH_TYPE_IM4004’ undeclared here (not in a function) arch/arm/mach-ks8695/board-og.c:190: error: ‘MACH_TYPE_IM42XX’ undeclared here (not in a function) Add the removed OpenGear board IDs back into the mach-types file. Signed-off-by: Greg Ungerer --- v2: update commit log to reflect actual compile error now arch/arm/tools/mach-types | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types index df1aefb..d5f2fe5 100644 --- a/arch/arm/tools/mach-types +++ b/arch/arm/tools/mach-types @@ -132,12 +132,14 @@ kb9200 MACH_KB9200 KB9200 612 sx1 MACH_SX1 SX1 613 ixdp465 MACH_IXDP465 IXDP465 618 ixdp2351 MACH_IXDP2351 IXDP2351 619 +cm4008 MACH_CM4008 CM4008 624 iq80332 MACH_IQ80332 IQ80332 629 gtwx5715 MACH_GTWX5715 GTWX5715 641 csb637 MACH_CSB637 CSB637 648 n30 MACH_N30 N30 656 nec_mp900 MACH_NEC_MP900 NEC_MP900 659 kafa MACH_KAFA KAFA 662 +cm41xx MACH_CM41XX CM41XX 672 ts72xx MACH_TS72XX TS72XX 673 otom MACH_OTOM OTOM 680 nexcoder_2440 MACH_NEXCODER_2440 NEXCODER_2440 681 @@ -180,6 +182,7 @@ mx21ads MACH_MX21ADS MX21ADS 851 ams_delta MACH_AMS_DELTA AMS_DELTA 862 nas100d MACH_NAS100D NAS100D 865 magician MACH_MAGICIAN MAGICIAN 875 +cm4002 MACH_CM4002 CM4002 876 nxdkn MACH_NXDKN NXDKN 880 palmtx MACH_PALMTX PALMTX 885 s3c2413 MACH_S3C2413 S3C2413 887 @@ -216,6 +219,7 @@ fsg MACH_FSG FSG 1091 at91sam9260ek MACH_AT91SAM9260EK AT91SAM9260EK 1099 glantank MACH_GLANTANK GLANTANK 1100 n2100 MACH_N2100 N2100 1101 +im42xx MACH_IM42XX IM42XX 1105 qt2410 MACH_QT2410 QT2410 1108 kixrp435 MACH_KIXRP435 KIXRP435 1109 cc9p9360dev MACH_CC9P9360DEV CC9P9360DEV 1114 @@ -249,6 +253,7 @@ csb726 MACH_CSB726 CSB726 1359 davinci_dm6467_evm MACH_DAVINCI_DM6467_EVM DAVINCI_DM6467_EVM 1380 davinci_dm355_evm MACH_DAVINCI_DM355_EVM DAVINCI_DM355_EVM 1381 littleton MACH_LITTLETON LITTLETON 1388 +im4004 MACH_IM4004 IM4004 1400 realview_pb11mp MACH_REALVIEW_PB11MP REALVIEW_PB11MP 1407 mx27_3ds MACH_MX27_3DS MX27_3DS 1430 halibut MACH_HALIBUT HALIBUT 1439