From patchwork Thu Jul  1 13:22:55 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Christoph Egger <siccegge@cs.fau.de>
X-Patchwork-Id: 109108
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o61DNNfv022835
	for <patchwork-omap@patchwork.kernel.org>;
	Thu, 1 Jul 2010 13:23:23 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755758Ab0GANW7 (ORCPT
	<rfc822;patchwork-omap@patchwork.kernel.org>);
	Thu, 1 Jul 2010 09:22:59 -0400
Received: from faui40.informatik.uni-erlangen.de ([131.188.34.40]:53668 "EHLO
	faui40.informatik.uni-erlangen.de" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1754238Ab0GANW6 (ORCPT
	<rfc822; linux-omap@vger.kernel.org>); Thu, 1 Jul 2010 09:22:58 -0400
Received: from faui48a.informatik.uni-erlangen.de
	(faui48a.informatik.uni-erlangen.de [131.188.34.55])
	by faui40.informatik.uni-erlangen.de (Postfix) with ESMTP id
	993D45F1C2; Thu,  1 Jul 2010 15:22:55 +0200 (MEST)
Received: by faui48a.informatik.uni-erlangen.de (Postfix, from userid 31996)
	id 84BB8774427; Thu,  1 Jul 2010 15:22:55 +0200 (CEST)
Date: Thu, 1 Jul 2010 15:22:55 +0200
From: Christoph Egger <siccegge@cs.fau.de>
To: "Kirill A. Shutemov" <kirill@shutemov.name>
Cc: Tony Lindgren <tony@atomide.com>, Russell King <linux@arm.linux.org.uk>,
	Cory Maccarrone <darkstar6262@gmail.com>,
	"Zebediah C. McClure" <zmc@lurian.net>,
	Alistair Buxton <a.j.buxton@gmail.com>, linux-omap@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org,
	vamos@i4.informatik.uni-erlangen.de
Subject: Re: [PATCH 03/33] Removing dead OMAP_MUX_ERRORS
Message-ID: <20100701132255.GA32541@faui48a.informatik.uni-erlangen.de>
References: <cover.1277911345.git.siccegge@cs.fau.de>
	<b6ca168f9459162f2c96aa8ef999047a3c4f6f9c.1277911346.git.siccegge@cs.fau.de>
	<20100630195409.GC3969@shutemov.name>
MIME-Version: 1.0
Content-Disposition: inline
In-Reply-To: <20100630195409.GC3969@shutemov.name>
User-Agent: Mutt/1.5.18 (2008-05-17)
Sender: linux-omap-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-omap.vger.kernel.org>
X-Mailing-List: linux-omap@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Thu, 01 Jul 2010 13:23:24 +0000 (UTC)


diff --git a/arch/arm/mach-omap1/mux.c b/arch/arm/mach-omap1/mux.c
index 8434137..3e98835 100644
--- a/arch/arm/mach-omap1/mux.c
+++ b/arch/arm/mach-omap1/mux.c
@@ -440,7 +440,7 @@ int __init_or_module omap1_cfg_reg(const struct pin_config *cfg)
 	}
 #endif
 
-#ifdef CONFIG_OMAP_MUX_ERRORS
+#ifdef CONFIG_OMAP_MUX_WARNINGS
 	return warn ? -ETXTBSY : 0;
 #else
 	return 0;