From patchwork Wed Jun 30 15:58:07 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: 108883
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 o5UFwrbZ024626
	for <patchwork-omap@patchwork.kernel.org>;
	Wed, 30 Jun 2010 15:58:53 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1756245Ab0F3P6L (ORCPT
	<rfc822;patchwork-omap@patchwork.kernel.org>);
	Wed, 30 Jun 2010 11:58:11 -0400
Received: from faui40.informatik.uni-erlangen.de ([131.188.34.40]:39766 "EHLO
	faui40.informatik.uni-erlangen.de" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1754677Ab0F3P6J (ORCPT
	<rfc822;linux-omap@vger.kernel.org>);
	Wed, 30 Jun 2010 11:58:09 -0400
Received: from faui49p (faui49p.informatik.uni-erlangen.de [131.188.42.67])
	by faui40.informatik.uni-erlangen.de (Postfix) with SMTP id
	B14495F27B; Wed, 30 Jun 2010 17:58:07 +0200 (MEST)
Received: by faui49p (sSMTP sendmail emulation);
	Wed, 30 Jun 2010 17:58:07 +0200
Date: Wed, 30 Jun 2010 17:58:07 +0200
From: Christoph Egger <siccegge@cs.fau.de>
To: Tony Lindgren <tony@atomide.com>, Russell King <linux@arm.linux.org.uk>,
	Paul Walmsley <paul@pwsan.com>,
	Kevin Hilman <khilman@deeprootsystems.com>,
	Tero Kristo <tero.kristo@nokia.com>,
	Hiroshi DOYU <Hiroshi.DOYU@nokia.com>, Pavel Machek <pavel@ucw.cz>,
	Andrew Morton <akpm@linux-foundation.org>,
	Magnus Damm <damm@igel.co.jp>, Alexey Dobriyan <adobriyan@gmail.com>,
	linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org
Cc: vamos@i4.informatik.uni-erlangen.de
Subject: [PATCH 13/33] Replacing LEDS_OMAP_DEBUG with OMAP_DEBUG_LEDS
Message-ID: 
 <b1363abf63cf2e35450acae82765ba679f1979bc.1277911346.git.siccegge@cs.fau.de>
References: <cover.1277911345.git.siccegge@cs.fau.de>
MIME-Version: 1.0
Content-Disposition: inline
In-Reply-To: <cover.1277911345.git.siccegge@cs.fau.de>
User-Agent: Mutt/1.5.20 (2009-06-14)
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]);
	Wed, 30 Jun 2010 15:58:54 +0000 (UTC)


diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index 78b49a6..a5337c8 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -51,7 +51,7 @@ config OMAP_DEBUG_DEVICES
 config OMAP_DEBUG_LEDS
 	bool
 	depends on OMAP_DEBUG_DEVICES
-	default y if LEDS || LEDS_OMAP_DEBUG
+	default y if LEDS
 
 config OMAP_RESET_CLOCKS
 	bool "Reset unused clocks during boot"
diff --git a/arch/arm/plat-omap/debug-leds.c b/arch/arm/plat-omap/debug-leds.c
index 53fcef7..fc05b10 100644
--- a/arch/arm/plat-omap/debug-leds.c
+++ b/arch/arm/plat-omap/debug-leds.c
@@ -39,7 +39,7 @@ static struct h2p2_dbg_fpga __iomem	*fpga;
 static u16				led_state, hw_led_state;
 
 
-#ifdef	CONFIG_LEDS_OMAP_DEBUG
+#ifdef	CONFIG_OMAP_DEBUG_LEDS
 #define new_led_api()	1
 #else
 #define new_led_api()	0