Re: [PATCH 05/10] omap mailbox: fix empty struct device for omap1

[Hiroshi DOYU]

 From: ext Russell King - ARM Linux <linux@xxxxxxxxxxxxxxxx>
Subject: Re: [PATCH 05/10] omap mailbox: fix empty struct device for omap1
Date: Wed, 28 Jan 2009 18:50:43 +0100

> On Wed, Jan 28, 2009 at 05:29:51PM +0200, Hiroshi DOYU wrote:
> > diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c
> > index 44e9101..af32db0 100644
> > --- a/arch/arm/mach-omap2/mailbox.c
> > +++ b/arch/arm/mach-omap2/mailbox.c
> > @@ -14,7 +14,9 @@
> >  #include <linux/clk.h>
> >  #include <linux/err.h>
> >  #include <linux/platform_device.h>
> > -#include <linux/io.h>
> > +
> > +#include <asm/io.h>
> > +
> 
> NAK.
> 
> > diff --git a/arch/arm/mach-omap1/mailbox.c b/arch/arm/mach-omap1/mailbox.c
> > index 59abbf3..92a90be 100644
> > --- a/arch/arm/mach-omap1/mailbox.c
> > +++ b/arch/arm/mach-omap1/mailbox.c
> > @@ -1,7 +1,7 @@
> >  /*
> >   * Mailbox reservation modules for DSP
> >   *
> > - * Copyright (C) 2006 Nokia Corporation
> > + * Copyright (C) 2006-2009 Nokia Corporation
> >   * Written by: Hiroshi DOYU <Hiroshi.DOYU@xxxxxxxxx>
> >   *
> >   * This file is subject to the terms and conditions of the GNU General Public
> > @@ -13,7 +13,9 @@
> >  #include <linux/resource.h>
> >  #include <linux/interrupt.h>
> >  #include <linux/platform_device.h>
> > -#include <linux/io.h>
> > +
> > +#include <asm/io.h>
> > +
> 
> NAK.
> 
> See fced80c735941fa518ac67c0b61bbe153fb8c050.
> 
> The above can not be explained by a mis-merge - they are not a mere
> reversion of the above change.  They look like a purposeful change
> back to the wrong include file.

It seems that I misunderstood your comment in the following mail.

http://lkml.indiana.edu/hypermail/linux/kernel/0901.2/00610.html

Reverted both header file changes. Update attached patches.