Hi Yinghai,
On Mon, 25 Aug 2008 10:45:22 -0700 "Yinghai Lu" <yhlu.kernel@xxxxxxxxx> wrote:
>
> On Mon, Aug 25, 2008 at 10:42 AM, Yinghai Lu <yhlu.kernel@xxxxxxxxx> wrote:
> >
> > seems there is some merge problem...
> > please check.
> >
> > diff --git a/include/linux/kernel_stat.h b/include/linux/kernel_stat.h
> > index f106167..3cd7389 100644
> > --- a/include/linux/kernel_stat.h
> > +++ b/include/linux/kernel_stat.h
> > @@ -28,7 +28,7 @@ struct cpu_usage_stat {
> >
> > struct kernel_stat {
> > struct cpu_usage_stat cpustat;
> > -#ifndef CONFIG_GENERIC_HARDIRQS
> > +#ifndef CONFIG_HAVE_SPARSE_IRQ
> > unsigned int irqs[NR_IRQS];
> > #endif
> > };
>
> more than that, will double check that.
I applied the above patch and it allows the tree to build, so I will
leave it in for today.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpJccUwJtMZx.pgp
Description: PGP signature
