linux-next: build failure after merge of the usb tree
in [Kernel]
|
Prev: [PATCH 0/2] hwmon: Update coretemp to current Intel processors
Next: [PATCH v2] ad7877: fix spi word size to 16 bit
From: Stephen Rothwell on 18 May 2010 03:50 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"). -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au http://www.canb.auug.org.au/~sfr/
From: Greg KH on 18 May 2010 10:10 On Tue, May 18, 2010 at 09:54:45AM -0400, Alan Stern wrote: > 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? Will do, thanks for the patch. greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Alan Stern on 18 May 2010 10:10 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; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Greg KH on 18 May 2010 10:10 On Tue, May 18, 2010 at 05:42:53PM +1000, 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"). Ick. Alan, care to send either a fix-up patch I can merge with the original, or a separate patch to resolve this? thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Greg KH on 18 May 2010 17:30
On Tue, May 18, 2010 at 09:54:45AM -0400, Alan Stern wrote: > 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? Thanks, now merged and pushed out. greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |