* [PATCH] mmc: at91_mci: Don't include asm/mach/mmc.h
@ 2009-10-08 10:12 Uwe Kleine-König
2009-10-08 11:26 ` Linus Walleij
` (3 more replies)
0 siblings, 4 replies; 11+ messages in thread
From: Uwe Kleine-König @ 2009-10-08 10:12 UTC (permalink / raw)
To: linux-arm-kernel
This fixes a compile bug introduced in
6ef297f (ARM: 5720/1: Move MMCI header to amba include dir)
That commit moved arch/arm/include/asm/mach/mmc.h to
include/linux/amba/mmci.h. Just removing the include was enough.
Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Linus Walleij <linus.walleij@stericsson.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Pierre Ossman <drzeus@drzeus.cx>
Cc: linux-arm-kernel at lists.infradead.org
---
drivers/mmc/host/at91_mci.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c
index e556d42..63924e0 100644
--- a/drivers/mmc/host/at91_mci.c
+++ b/drivers/mmc/host/at91_mci.c
@@ -72,7 +72,6 @@
#include <asm/irq.h>
#include <asm/gpio.h>
-#include <asm/mach/mmc.h>
#include <mach/board.h>
#include <mach/cpu.h>
#include <mach/at91_mci.h>
--
1.6.4.3
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH] mmc: at91_mci: Don't include asm/mach/mmc.h
2009-10-08 10:12 [PATCH] mmc: at91_mci: Don't include asm/mach/mmc.h Uwe Kleine-König
@ 2009-10-08 11:26 ` Linus Walleij
2009-10-08 12:14 ` Nicolas Ferre
` (2 subsequent siblings)
3 siblings, 0 replies; 11+ messages in thread
From: Linus Walleij @ 2009-10-08 11:26 UTC (permalink / raw)
To: linux-arm-kernel
2009/10/8 Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>:
> This fixes a compile bug introduced in
>
> ? ? ? ?6ef297f (ARM: 5720/1: Move MMCI header to amba include dir)
>
> That commit moved arch/arm/include/asm/mach/mmc.h to
> include/linux/amba/mmci.h. ?Just removing the include was enough.
>
> Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Cc: Linus Walleij <linus.walleij@stericsson.com>
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
The include paths in the kernel lead me astray... Weird that this
driver included that file at all though, but I guess the driver was derived
from MMCI at some early staget and it got left in?
Linus Walleij
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH] mmc: at91_mci: Don't include asm/mach/mmc.h
2009-10-08 10:12 [PATCH] mmc: at91_mci: Don't include asm/mach/mmc.h Uwe Kleine-König
2009-10-08 11:26 ` Linus Walleij
@ 2009-10-08 12:14 ` Nicolas Ferre
2009-10-08 12:18 ` Bill Gatliff
2009-10-13 7:19 ` Uwe Kleine-König
3 siblings, 0 replies; 11+ messages in thread
From: Nicolas Ferre @ 2009-10-08 12:14 UTC (permalink / raw)
To: linux-arm-kernel
Uwe Kleine-K?nig :
> This fixes a compile bug introduced in
>
> 6ef297f (ARM: 5720/1: Move MMCI header to amba include dir)
>
> That commit moved arch/arm/include/asm/mach/mmc.h to
> include/linux/amba/mmci.h. Just removing the include was enough.
>
> Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Cc: Linus Walleij <linus.walleij@stericsson.com>
> Cc: Russell King <rmk+kernel@arm.linux.org.uk>
> Cc: Pierre Ossman <drzeus@drzeus.cx>
> Cc: linux-arm-kernel at lists.infradead.org
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> ---
> drivers/mmc/host/at91_mci.c | 1 -
> 1 files changed, 0 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c
> index e556d42..63924e0 100644
> --- a/drivers/mmc/host/at91_mci.c
> +++ b/drivers/mmc/host/at91_mci.c
> @@ -72,7 +72,6 @@
> #include <asm/irq.h>
> #include <asm/gpio.h>
>
> -#include <asm/mach/mmc.h>
> #include <mach/board.h>
> #include <mach/cpu.h>
> #include <mach/at91_mci.h>
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH] mmc: at91_mci: Don't include asm/mach/mmc.h
2009-10-08 10:12 [PATCH] mmc: at91_mci: Don't include asm/mach/mmc.h Uwe Kleine-König
2009-10-08 11:26 ` Linus Walleij
2009-10-08 12:14 ` Nicolas Ferre
@ 2009-10-08 12:18 ` Bill Gatliff
2009-10-13 7:19 ` Uwe Kleine-König
3 siblings, 0 replies; 11+ messages in thread
From: Bill Gatliff @ 2009-10-08 12:18 UTC (permalink / raw)
To: linux-arm-kernel
Uwe Kleine-K?nig wrote:
> This fixes a compile bug introduced in
>
> 6ef297f (ARM: 5720/1: Move MMCI header to amba include dir)
>
> That commit moved arch/arm/include/asm/mach/mmc.h to
> include/linux/amba/mmci.h. Just removing the include was enough.
>
> Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Cc: Linus Walleij <linus.walleij@stericsson.com>
> Cc: Russell King <rmk+kernel@arm.linux.org.uk>
> Cc: Pierre Ossman <drzeus@drzeus.cx>
> Cc: linux-arm-kernel at lists.infradead.org
> ---
> drivers/mmc/host/at91_mci.c | 1 -
> 1 files changed, 0 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c
> index e556d42..63924e0 100644
> --- a/drivers/mmc/host/at91_mci.c
> +++ b/drivers/mmc/host/at91_mci.c
> @@ -72,7 +72,6 @@
> #include <asm/irq.h>
> #include <asm/gpio.h>
>
> -#include <asm/mach/mmc.h>
> #include <mach/board.h>
> #include <mach/cpu.h>
> #include <mach/at91_mci.h>
>
Acked-by: Bill Gatliff <bgat@billgatliff.com>
b.g.
--
Bill Gatliff
bgat at billgatliff.com
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH] mmc: at91_mci: Don't include asm/mach/mmc.h
2009-10-08 10:12 [PATCH] mmc: at91_mci: Don't include asm/mach/mmc.h Uwe Kleine-König
` (2 preceding siblings ...)
2009-10-08 12:18 ` Bill Gatliff
@ 2009-10-13 7:19 ` Uwe Kleine-König
2009-10-13 7:36 ` Nicolas Ferre
2009-10-20 22:37 ` [PATCH] " Linus Walleij
3 siblings, 2 replies; 11+ messages in thread
From: Uwe Kleine-König @ 2009-10-13 7:19 UTC (permalink / raw)
To: linux-arm-kernel
This fixes a compile error introduced in
6ef297f (ARM: 5720/1: Move MMCI header to amba include dir)
That commit moved arch/arm/include/asm/mach/mmc.h to
include/linux/amba/mmci.h. Just removing the include was enough.
Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Bill Gatliff <bgat@billgatliff.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Pierre Ossman <drzeus@drzeus.cx>
Cc: linux-arm-kernel at lists.infradead.org
Cc: Andrew Morton <akpm@linux-foundation.org>
---
Hello,
what is the right path to Linus for this patch?
Best regards
Uwe
drivers/mmc/host/at91_mci.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c
index e556d42..63924e0 100644
--- a/drivers/mmc/host/at91_mci.c
+++ b/drivers/mmc/host/at91_mci.c
@@ -72,7 +72,6 @@
#include <asm/irq.h>
#include <asm/gpio.h>
-#include <asm/mach/mmc.h>
#include <mach/board.h>
#include <mach/cpu.h>
#include <mach/at91_mci.h>
--
1.6.4.3
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH] mmc: at91_mci: Don't include asm/mach/mmc.h
2009-10-13 7:19 ` Uwe Kleine-König
@ 2009-10-13 7:36 ` Nicolas Ferre
2009-10-20 17:27 ` Bill Gatliff
2009-10-20 22:37 ` [PATCH] " Linus Walleij
1 sibling, 1 reply; 11+ messages in thread
From: Nicolas Ferre @ 2009-10-13 7:36 UTC (permalink / raw)
To: linux-arm-kernel
Uwe Kleine-K?nig :
> This fixes a compile error introduced in
>
> 6ef297f (ARM: 5720/1: Move MMCI header to amba include dir)
>
> That commit moved arch/arm/include/asm/mach/mmc.h to
> include/linux/amba/mmci.h. Just removing the include was enough.
>
> Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
> Acked-by: Linus Walleij <linus.walleij@stericsson.com>
> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> Acked-by: Bill Gatliff <bgat@billgatliff.com>
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Cc: Russell King <rmk+kernel@arm.linux.org.uk>
> Cc: Pierre Ossman <drzeus@drzeus.cx>
> Cc: linux-arm-kernel at lists.infradead.org
> Cc: Andrew Morton <akpm@linux-foundation.org>
> ---
> Hello,
>
> what is the right path to Linus for this patch?
Uwe,
I gess that Andrew Morton will have to handle it.
Let's help him not forget it ;-)
Bye,
> drivers/mmc/host/at91_mci.c | 1 -
> 1 files changed, 0 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c
> index e556d42..63924e0 100644
> --- a/drivers/mmc/host/at91_mci.c
> +++ b/drivers/mmc/host/at91_mci.c
> @@ -72,7 +72,6 @@
> #include <asm/irq.h>
> #include <asm/gpio.h>
>
> -#include <asm/mach/mmc.h>
> #include <mach/board.h>
> #include <mach/cpu.h>
> #include <mach/at91_mci.h>
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH] mmc: at91_mci: Don't include asm/mach/mmc.h
2009-10-13 7:36 ` Nicolas Ferre
@ 2009-10-20 17:27 ` Bill Gatliff
2009-10-21 7:46 ` [PATCH RESEND#2] " Uwe Kleine-König
0 siblings, 1 reply; 11+ messages in thread
From: Bill Gatliff @ 2009-10-20 17:27 UTC (permalink / raw)
To: linux-arm-kernel
Nicolas Ferre wrote:
> Uwe Kleine-K?nig :
>
>> This fixes a compile error introduced in
>>
>> 6ef297f (ARM: 5720/1: Move MMCI header to amba include dir)
>>
>> That commit moved arch/arm/include/asm/mach/mmc.h to
>> include/linux/amba/mmci.h. Just removing the include was enough.
>>
>> Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
>> Acked-by: Linus Walleij <linus.walleij@stericsson.com>
>> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
>> Acked-by: Bill Gatliff <bgat@billgatliff.com>
>> Cc: Catalin Marinas <catalin.marinas@arm.com>
>> Cc: Russell King <rmk+kernel@arm.linux.org.uk>
>> Cc: Pierre Ossman <drzeus@drzeus.cx>
>> Cc: linux-arm-kernel at lists.infradead.org
>> Cc: Andrew Morton <akpm@linux-foundation.org>
>> ---
>> Hello,
>>
>> what is the right path to Linus for this patch?
>>
>
> Uwe,
>
> I gess that Andrew Morton will have to handle it.
>
> Let's help him not forget it ;-)
>
Indeed! This one _really_ annoys me.
b.g.
--
Bill Gatliff
bgat at billgatliff.com
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH RESEND#2] mmc: at91_mci: Don't include asm/mach/mmc.h
2009-10-20 17:27 ` Bill Gatliff
@ 2009-10-21 7:46 ` Uwe Kleine-König
2009-10-21 7:53 ` Nicolas Ferre
0 siblings, 1 reply; 11+ messages in thread
From: Uwe Kleine-König @ 2009-10-21 7:46 UTC (permalink / raw)
To: linux-arm-kernel
This fixes a compile bug introduced in
6ef297f (ARM: 5720/1: Move MMCI header to amba include dir)
That commit moved arch/arm/include/asm/mach/mmc.h to
include/linux/amba/mmci.h. Just removing the include was enough.
Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Bill Gatliff <bgat@billgatliff.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Pierre Ossman <drzeus@drzeus.cx>
Cc: linux-arm-kernel at lists.infradead.org
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
---
Hello,
this patch is a build fix that seems to bite quite some people, but
nobody has picked it up until now.
Linus Walleij suggested to send it to Russell's patch tracker, but I
don't think this is the right way for that patch. It should either go
via Pierre or (IMO preferably) via Andrew.
Best regards
Uwe
drivers/mmc/host/at91_mci.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c
index e556d42..63924e0 100644
--- a/drivers/mmc/host/at91_mci.c
+++ b/drivers/mmc/host/at91_mci.c
@@ -72,7 +72,6 @@
#include <asm/irq.h>
#include <asm/gpio.h>
-#include <asm/mach/mmc.h>
#include <mach/board.h>
#include <mach/cpu.h>
#include <mach/at91_mci.h>
--
1.6.5
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH RESEND#2] mmc: at91_mci: Don't include asm/mach/mmc.h
2009-10-21 7:46 ` [PATCH RESEND#2] " Uwe Kleine-König
@ 2009-10-21 7:53 ` Nicolas Ferre
2009-10-21 8:12 ` Uwe Kleine-König
0 siblings, 1 reply; 11+ messages in thread
From: Nicolas Ferre @ 2009-10-21 7:53 UTC (permalink / raw)
To: linux-arm-kernel
Uwe Kleine-K?nig :
> This fixes a compile bug introduced in
>
> 6ef297f (ARM: 5720/1: Move MMCI header to amba include dir)
>
> That commit moved arch/arm/include/asm/mach/mmc.h to
> include/linux/amba/mmci.h. Just removing the include was enough.
FYI it is already in -mm patchsed as:
mmc-at91_mci-dont-include-asm-mach-mmch.patch
We now just have to track its way to mainline.
Bye,
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH RESEND#2] mmc: at91_mci: Don't include asm/mach/mmc.h
2009-10-21 7:53 ` Nicolas Ferre
@ 2009-10-21 8:12 ` Uwe Kleine-König
0 siblings, 0 replies; 11+ messages in thread
From: Uwe Kleine-König @ 2009-10-21 8:12 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Oct 21, 2009 at 09:53:47AM +0200, Nicolas Ferre wrote:
> Uwe Kleine-K?nig :
> > This fixes a compile bug introduced in
> >
> > 6ef297f (ARM: 5720/1: Move MMCI header to amba include dir)
> >
> > That commit moved arch/arm/include/asm/mach/mmc.h to
> > include/linux/amba/mmci.h. Just removing the include was enough.
>
> FYI it is already in -mm patchsed as:
> mmc-at91_mci-dont-include-asm-mach-mmch.patch
oh right. I was pretty sure I didn't get a "patch was added to mm" mail
by Andrew, but searching my inbox proofed me wrong.
Sorry
Uwe
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH] mmc: at91_mci: Don't include asm/mach/mmc.h
2009-10-13 7:19 ` Uwe Kleine-König
2009-10-13 7:36 ` Nicolas Ferre
@ 2009-10-20 22:37 ` Linus Walleij
1 sibling, 0 replies; 11+ messages in thread
From: Linus Walleij @ 2009-10-20 22:37 UTC (permalink / raw)
To: linux-arm-kernel
2009/10/13 Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>:
> what is the right path to Linus for this patch?
I would simply put it into Russells patch tracker as it's an ARM system.
Linus Walleij
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2009-10-21 8:12 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-10-08 10:12 [PATCH] mmc: at91_mci: Don't include asm/mach/mmc.h Uwe Kleine-König
2009-10-08 11:26 ` Linus Walleij
2009-10-08 12:14 ` Nicolas Ferre
2009-10-08 12:18 ` Bill Gatliff
2009-10-13 7:19 ` Uwe Kleine-König
2009-10-13 7:36 ` Nicolas Ferre
2009-10-20 17:27 ` Bill Gatliff
2009-10-21 7:46 ` [PATCH RESEND#2] " Uwe Kleine-König
2009-10-21 7:53 ` Nicolas Ferre
2009-10-21 8:12 ` Uwe Kleine-König
2009-10-20 22:37 ` [PATCH] " Linus Walleij
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).