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

[Russell King - ARM Linux]

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.

Can someone please work out why this has happened and what needs to
be done to prevent it happening in the future.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/