Received: from mail.onstor.com ([66.201.51.107]) by onstor-exch02.onstor.net with Microsoft SMTPSVC(6.0.3790.1830);
	 Fri, 24 Aug 2007 07:29:28 -0700
Received: from ftp.linux-mips.org ([194.74.144.162]) by mail.onstor.com with Microsoft SMTPSVC(6.0.3790.1830);
	 Fri, 24 Aug 2007 07:29:28 -0700
Received: from localhost.localdomain ([127.0.0.1]:51383 "EHLO
	ftp.linux-mips.org") by ftp.linux-mips.org with ESMTP
	id S20023931AbXHXO3F convert rfc822-to-quoted-printable (ORCPT
	<rfc822;dan.stein@onstor.com> + 1 other);
	Fri, 24 Aug 2007 15:29:05 +0100
Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 24 Aug 2007 15:28:45 +0100 (BST)
Received: from 85-18-251-172.ip.fastwebnet.it ([85.18.251.172]:25005 "EHLO
	memento.home.lan") by ftp.linux-mips.org with ESMTP
	id S20023903AbXHXO2g (ORCPT <rfc822;linux-mips@linux-mips.org>);
	Fri, 24 Aug 2007 15:28:36 +0100
Received: from americanbeauty.home.lan (localhost.localdomain [127.0.0.1])
	by memento.home.lan (Postfix) with ESMTP id BAFB1108B3;
	Fri, 24 Aug 2007 13:28:57 +0200 (CEST)
From:	Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Subject: [PATCH 1/2] Replace CONFIG_USB_OHCI with CONFIG_USB_OHCI_HCD in a few
	overlooked files
To:	Andrew Morton <akpm@linux-foundation.org>
Cc:	linux-kernel@vger.kernel.org,
	Giuseppe =?utf-8?q?Patan=C3=A8?= <giuseppe.patane@tvblob.com>,
	Ralf Baechle <ralf@linux-mips.org>,
	<linux-mips@linux-mips.org>,
	Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Date:	Fri, 24 Aug 2007 13:28:57 +0200
Message-ID: <20070824112857.9607.22924.stgit@americanbeauty.home.lan>
User-Agent: StGIT/0.12.1
MIME-Version: 1.0
Content-Type:	text/plain; charset=utf-8
Content-Transfer-Encoding: QUOTED-PRINTABLE
X-archive-position: 16274
X-ecartis-version: Ecartis v1.0.0
Sender:	linux-mips-bounce@linux-mips.org
Errors-to: linux-mips-bounce@linux-mips.org
X-original-sender: blaisorblade@yahoo.it
Precedence: bulk
X-list:	linux-mips
Return-Path: linux-mips-bounce@linux-mips.org
X-OriginalArrivalTime: 24 Aug 2007 14:29:28.0211 (UTC) FILETIME=[2D708630:01C7E65B]

=46inish the rename of CONFIG_USB_OHCI to CONFIG_USB_OHCI_HCD, which st=
arted
in 2005 (before 2.6.12-rc2). The patch in this message has not been app=
lied yet;
moreover, it is not something to fix afterwards. I've verified that no =
more
instances of 'CONFIG_USB_[UOE]HCI\>' exist in the source tree.

http://www.linux-mips.org/archives/linux-mips/2005-06/msg00060.html

I'm also sending a script to detect undefined Kconfig variables in next=
 patch.

Thanks to my colleague Giuseppe Patan=C3=A8 for the original report: he=
 discovered
the original mail (above) and for verified that the fix had not yet bee=
n
applied.

Cc: Giuseppe Patan=C3=A8 <giuseppe.patane@tvblob.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: <linux-mips@linux-mips.org>
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
---

 arch/mips/au1000/mtx-1/board_setup.c  |    4 ++--
 arch/mips/au1000/pb1000/board_setup.c |    6 +++---
 arch/mips/au1000/pb1100/board_setup.c |    4 ++--
 arch/mips/au1000/pb1500/board_setup.c |    6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/arch/mips/au1000/mtx-1/board_setup.c b/arch/mips/au1000/mt=
x-1/board_setup.c
index 7bc5af8..1688ca9 100644
--- a/arch/mips/au1000/mtx-1/board_setup.c
+++ b/arch/mips/au1000/mtx-1/board_setup.c
@@ -54,11 +54,11 @@ void board_reset (void)
=20
 void __init board_setup(void)
 {
-#ifdef CONFIG_USB_OHCI
+#ifdef CONFIG_USB_OHCI_HCD
 	// enable USB power switch
 	au_writel( au_readl(GPIO2_DIR) | 0x10, GPIO2_DIR );
 	au_writel( 0x100000, GPIO2_OUTPUT );
-#endif // defined (CONFIG_USB_OHCI)
+#endif // defined (CONFIG_USB_OHCI_HCD)
=20
 #ifdef CONFIG_PCI
 #if defined(__MIPSEB__)
diff --git a/arch/mips/au1000/pb1000/board_setup.c b/arch/mips/au1000/p=
b1000/board_setup.c
index 824cfaf..f25b38f 100644
--- a/arch/mips/au1000/pb1000/board_setup.c
+++ b/arch/mips/au1000/pb1000/board_setup.c
@@ -54,7 +54,7 @@ void __init board_setup(void)
 	au_writel(0, SYS_PINSTATERD);
 	udelay(100);
=20
-#ifdef CONFIG_USB_OHCI
+#ifdef CONFIG_USB_OHCI_HCD
 	/* zero and disable FREQ2 */
 	sys_freqctrl =3D au_readl(SYS_FREQCTRL0);
 	sys_freqctrl &=3D ~0xFFF00000;
@@ -102,7 +102,7 @@ void __init board_setup(void)
 	/*
 	 * Route 48MHz FREQ2 into USB Host and/or Device
 	 */
-#ifdef CONFIG_USB_OHCI
+#ifdef CONFIG_USB_OHCI_HCD
 	sys_clksrc |=3D ((4<<12) | (0<<11) | (0<<10));
 #endif
 	au_writel(sys_clksrc, SYS_CLKSRC);
@@ -116,7 +116,7 @@ void __init board_setup(void)
 	au_writel(pin_func, SYS_PINFUNC);
 	au_writel(0x2800, SYS_TRIOUTCLR);
 	au_writel(0x0030, SYS_OUTPUTCLR);
-#endif // defined (CONFIG_USB_OHCI)
+#endif // defined (CONFIG_USB_OHCI_HCD)
=20
 	// make gpio 15 an input (for interrupt line)
 	pin_func =3D au_readl(SYS_PINFUNC) & (u32)(~0x100);
diff --git a/arch/mips/au1000/pb1100/board_setup.c b/arch/mips/au1000/p=
b1100/board_setup.c
index 6bc1f8e..3205f88 100644
--- a/arch/mips/au1000/pb1100/board_setup.c
+++ b/arch/mips/au1000/pb1100/board_setup.c
@@ -54,7 +54,7 @@ void __init board_setup(void)
 	au_writel(0, SYS_PININPUTEN);
 	udelay(100);
=20
-#ifdef CONFIG_USB_OHCI
+#ifdef CONFIG_USB_OHCI_HCD
 	{
 		u32 pin_func, sys_freqctrl, sys_clksrc;
=20
@@ -98,7 +98,7 @@ void __init board_setup(void)
 		pin_func |=3D 0x8000;
 		au_writel(pin_func, SYS_PINFUNC);
 	}
-#endif // defined (CONFIG_USB_OHCI)
+#endif // defined (CONFIG_USB_OHCI_HCD)
=20
 	/* Enable sys bus clock divider when IDLE state or no bus activity. *=
/
 	au_writel(au_readl(SYS_POWERCTRL) | (0x3 << 5), SYS_POWERCTRL);
diff --git a/arch/mips/au1000/pb1500/board_setup.c b/arch/mips/au1000/p=
b1500/board_setup.c
index c9b6556..118e32a 100644
--- a/arch/mips/au1000/pb1500/board_setup.c
+++ b/arch/mips/au1000/pb1500/board_setup.c
@@ -56,7 +56,7 @@ void __init board_setup(void)
 	au_writel(0, SYS_PINSTATERD);
 	udelay(100);
=20
-#ifdef CONFIG_USB_OHCI
+#ifdef CONFIG_USB_OHCI_HCD
=20
 	/* GPIO201 is input for PCMCIA card detect */
 	/* GPIO203 is input for PCMCIA interrupt request */
@@ -85,7 +85,7 @@ void __init board_setup(void)
 	/*
 	 * Route 48MHz FREQ2 into USB Host and/or Device
 	 */
-#ifdef CONFIG_USB_OHCI
+#ifdef CONFIG_USB_OHCI_HCD
 	sys_clksrc |=3D ((4<<12) | (0<<11) | (0<<10));
 #endif
 	au_writel(sys_clksrc, SYS_CLKSRC);
@@ -95,7 +95,7 @@ void __init board_setup(void)
 	// 2nd USB port is USB host
 	pin_func |=3D 0x8000;
 	au_writel(pin_func, SYS_PINFUNC);
-#endif // defined (CONFIG_USB_OHCI)
+#endif // defined (CONFIG_USB_OHCI_HCD)
=20
=20
=20


