public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Russell King <rmk+lkml@arm.linux.org.uk>
To: Richard Purdie <rpurdie@rpsys.net>
Cc: Pavel Machek <pavel@ucw.cz>,
	kernel list <linux-kernel@vger.kernel.org>,
	lenz@cs.wisc.edu
Subject: Re: Fix collie compilation
Date: Sat, 15 Apr 2006 16:17:35 +0100	[thread overview]
Message-ID: <20060415151735.GA19735@flint.arm.linux.org.uk> (raw)
In-Reply-To: <1145038279.6179.23.camel@localhost.localdomain>

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

      reply	other threads:[~2006-04-15 15:18 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-04-14 18:03 Fix collie compilation Pavel Machek
2006-04-14 18:11 ` Richard Purdie
2006-04-15 15:17   ` Russell King [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20060415151735.GA19735@flint.arm.linux.org.uk \
    --to=rmk+lkml@arm.linux.org.uk \
    --cc=lenz@cs.wisc.edu \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pavel@ucw.cz \
    --cc=rpurdie@rpsys.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox