From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757590Ab0ERNys (ORCPT ); Tue, 18 May 2010 09:54:48 -0400 Received: from iolanthe.rowland.org ([192.131.102.54]:56399 "HELO iolanthe.rowland.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1757542Ab0ERNyr (ORCPT ); Tue, 18 May 2010 09:54:47 -0400 Date: Tue, 18 May 2010 09:54:45 -0400 (EDT) From: Alan Stern X-X-Sender: stern@iolanthe.rowland.org To: Greg KH , Stephen Rothwell cc: linux-next@vger.kernel.org, Kernel development list Subject: Re: linux-next: build failure after merge of the usb tree In-Reply-To: <20100518174253.37e38d66.sfr@canb.auug.org.au> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 18 May 2010, Stephen Rothwell wrote: > Hi Greg, > > After merging the usb tree, today's linux-next build (powerpc > ppc6xx_defconfig) failed like this: > > drivers/usb/host/ehci-fsl.c:316: error: 'ehci' undeclared (first use in this function) > > Caused by commit d19f8cd047971b43844d61d995be736dacb4826a ("USB: EHCI: > fix controller wakeup flag settings during suspend"). Here's a fix for the problem. It's awfully easy to mess things up when changing code for architectures you don't have. Greg, can you merge this in with the original patch? Alan Stern Index: usb-2.6/drivers/usb/host/ehci-fsl.c =================================================================== --- usb-2.6.orig/drivers/usb/host/ehci-fsl.c +++ usb-2.6/drivers/usb/host/ehci-fsl.c @@ -313,7 +313,7 @@ static int ehci_fsl_drv_suspend(struct d struct ehci_fsl *ehci_fsl = hcd_to_ehci_fsl(hcd); void __iomem *non_ehci = hcd->regs; - ehci_prepare_ports_for_controller_suspend(ehci); + ehci_prepare_ports_for_controller_suspend(hcd_to_ehci(hcd)); if (!fsl_deep_sleep()) return 0;