Received: from mail.onstor.com (66.201.51.107) by exch1.onstor.net
 (10.0.0.225) with Microsoft SMTP Server id 8.1.311.2; Mon, 6 Apr 2009
 09:35:58 -0700
Received: from psmtp.com ([64.18.0.88]) by mail.onstor.com with Microsoft
 SMTPSVC(6.0.3790.3959);	 Mon, 6 Apr 2009 09:35:58 -0700
Received: from source ([213.58.128.207]) by exprod5mx265.postini.com
 ([64.18.4.11]) with SMTP;	Mon, 06 Apr 2009 09:35:58 PDT
Received: from localhost.localdomain ([127.0.0.1]:15303 "EHLO
	ftp.linux-mips.org") by ftp.linux-mips.org with ESMTP	id S20025088AbZDFPFV
 (ORCPT <rfc822;andy.sharp@onstor.com>);	Mon, 6 Apr 2009 16:05:21 +0100
Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 06 Apr 2009 16:05:04
 +0100 (BST)
Received: from mba.ocn.ne.jp ([122.1.235.107]:19178 "HELO smtp.mba.ocn.ne.jp")
	by ftp.linux-mips.org with SMTP id S20022127AbZDFPEz (ORCPT
	<rfc822;linux-mips@linux-mips.org>); Mon, 6 Apr 2009 16:04:55 +0100
Received: from localhost.localdomain (p7250-ipad207funabasi.chiba.ocn.ne.jp
 [222.145.89.250])	by smtp.mba.ocn.ne.jp (Postfix) with ESMTP	id 8E2F0A320;
 Tue,  7 Apr 2009 00:04:49 +0900 (JST)
From: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
To: "linux-mips@linux-mips.org" <linux-mips@linux-mips.org>
CC: "ralf@linux-mips.org" <ralf@linux-mips.org>, "Kevin D. Kissell"
	<kevink@paralogos.com>
Sender: "linux-mips-bounce@linux-mips.org" <linux-mips-bounce@linux-mips.org>
Date: Mon, 6 Apr 2009 08:04:55 -0700
Subject: [PATCH] Fix build error if CONFIG_CEVT_R4K was not defined
Thread-Topic: [PATCH] Fix build error if CONFIG_CEVT_R4K was not defined
Thread-Index: Acm21cQjtBnYvrFnQguKm9m6VbWyvw==
Message-ID: <1239030295-14080-1-git-send-email-anemo@mba.ocn.ne.jp>
Accept-Language: en-US
Content-Language: en-US
X-MS-Exchange-Organization-AuthAs: Internal
X-MS-Exchange-Organization-AuthMechanism: 0b
X-MS-Exchange-Organization-AuthSource: exch1.onstor.net
X-MS-Has-Attach:
X-Auto-Response-Suppress: All
X-MS-TNEF-Correlator:
x-originalarrivaltime: 06 Apr 2009 16:35:58.0595 (UTC)
 FILETIME=[C3CB7530:01C9B6D5]
errors-to: linux-mips-bounce@linux-mips.org
x-pstn-levels: (S:55.10961/99.90000 CV:99.9000 FC:95.5390 LC:95.5390
 R:95.9108 P:95.9108 M:97.0282 C:98.6951 )
x-pstn-neptune: 0/0/0.00/0
x-ems-proccessed: 2K3Xl1OQTInXD6xxuA8z3Q==
x-ems-stamp: t4sspHEvFlaypiaIgV7yBQ==
x-list: linux-mips
x-archive-position: 22262
x-ecartis-version: Ecartis v1.0.0
x-original-sender: anemo@mba.ocn.ne.jp
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

This patch fixes build error introduced by "MIPS: SMTC:
Fix xxx_clockevent_init() naming conflict for SMT".

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
---
 arch/mips/include/asm/time.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/mips/include/asm/time.h b/arch/mips/include/asm/time.h
index e46f23f..df6a430 100644
--- a/arch/mips/include/asm/time.h
+++ b/arch/mips/include/asm/time.h
@@ -61,7 +61,7 @@ static inline int mips_clockevent_init(void)
 	extern int smtc_clockevent_init(void);
=20
 	return smtc_clockevent_init();
-#elif CONFIG_CEVT_R4K
+#elif defined(CONFIG_CEVT_R4K)
 	return r4k_clockevent_init();
 #else
 	return -ENXIO;
--=20
1.5.6.3


