Messages in this thread | | | Date | Sat, 15 Apr 2006 16:17:35 +0100 | From | Russell King <> | Subject | Re: Fix collie compilation |
| |
On Fri, Apr 14, 2006 at 07:11:19PM +0100, Richard Purdie wrote: > On Fri, 2006-04-14 at 20:03 +0200, Pavel Machek wrote: > > Fix collie compilation with current defconfig > >[...] > > diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c > > index be589ce..9aa6cde 100644 > > --- a/arch/arm/mach-sa1100/collie.c > > +++ b/arch/arm/mach-sa1100/collie.c > > @@ -295,7 +295,9 @@ static void __init collie_init(void) > > LCM_DAC |= (LCM_DAC_SCLOEB | LCM_DAC_SDAOEB); /* init DAC */ > > #endif > > > > +#ifdef CONFIG_PCMCIA_SA1100 > > platform_scoop_config = &collie_pcmcia_config; > > +#endif > > I'm fine with the defconfig changes but this last bit doesn't fix the > original problem if CONFIG_PCMCIA_SA1100=m. The correct solution is to > move platform_scoop_config back to scoop.c which I'll submit a patch > for.
However, the patch doesn't apply to any -rc1 kernel, so it's been dropped on the floor.
It would be nice to get patches generated against mainline kernels, and which have been tested against mainline kernels...
-- Russell King Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/ maintainer of: 2.6 Serial core - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |