[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20090128.212122.193700100.Hiroshi.DOYU@nokia.com>
Date: Wed, 28 Jan 2009 21:21:22 +0200 (EET)
From: Hiroshi DOYU <Hiroshi.DOYU@...ia.com>
To: linux@....linux.org.uk
Cc: linux-kernel@...r.kernel.org,
linux-arm-kernel@...ts.arm.linux.org.uk, linux-omap@...r.kernel.org
Subject: Re: [PATCH 05/10] omap mailbox: fix empty struct device for omap1
From: ext Russell King - ARM Linux <linux@....linux.org.uk>
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@...ia.com>
> > *
> > * 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.
View attachment "0006-omap-mailbox-fix-empty-struct-device-for-omap2.patch" of type "Text/Plain" (2588 bytes)
View attachment "0005-omap-mailbox-fix-empty-struct-device-for-omap1.patch" of type "Text/Plain" (3405 bytes)
Powered by blists - more mailing lists