Skip to contentSkip to conversation

mmc: at91_mci: Don't include asm/mach/mmc.h

PATCH New Uwe Kleine-König 4 participants 11 messages Oct 8, 2009 – Oct 21, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mmc: at91_mci: Don't include asm/mach/mmc.h

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.

Cc Catalin Marinas <[email protected]>
Cc Linus Walleij <[email protected]>
Cc Russell King <[email protected]>
Cc Pierre Ossman <[email protected]>
Cc linux-arm-kernel at lists.infradead.org
---
 drivers/mmc/host/at91_mci.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
drivers/mmc/host/at91_mci.c +0 -1
index e556d42..63924e0 100644
@@ -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>
Signature · 1 line
1.6.4.3
#1 lore raw

PATCH 1/1 mmc: at91_mci: Don't include asm/mach/mmc.h

2009/10/8 Uwe Kleine-K?nig <[email protected]>:

Quoted 10 lines

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.

Cc Catalin Marinas <[email protected]>
Cc Linus Walleij <[email protected]>

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

#2 lore raw

PATCH 1/1 mmc: at91_mci: Don't include asm/mach/mmc.h

In reply to Uwe Kleine-König

Uwe Kleine-K?nig :

Quoted 7 lines

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.

Quoted 6 lines
Cc Catalin Marinas <[email protected]>
Cc Linus Walleij <[email protected]>
Cc Russell King <[email protected]>
Cc Pierre Ossman <[email protected]>
Cc linux-arm-kernel at lists.infradead.org
Quoted 16 lines
---
 drivers/mmc/host/at91_mci.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
drivers/mmc/host/at91_mci.c +0 -1
index e556d42..63924e0 100644
@@ -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>
Signature · 1 line
Nicolas Ferre
#3 lore raw

PATCH 1/1 mmc: at91_mci: Don't include asm/mach/mmc.h

In reply to Uwe Kleine-König
Quoted 23 lines · 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.

Cc Catalin Marinas <[email protected]>
Cc Linus Walleij <[email protected]>
Cc Russell King <[email protected]>
Cc Pierre Ossman <[email protected]>
Cc linux-arm-kernel at lists.infradead.org
---
 drivers/mmc/host/at91_mci.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
drivers/mmc/host/at91_mci.c +0 -0
index e556d42..63924e0 100644

drivers/mmc/host/at91_mci.c line 77

Quoted 7 lines
drivers/mmc/host/at91_mci.c +0 -1
@@ -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>

b.g.

Signature · 2 lines
Bill Gatliff
bgat at billgatliff.com
#4 lore raw

PATCH 1/1 mmc: at91_mci: Don't include asm/mach/mmc.h

In reply to 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.

Cc Catalin Marinas <[email protected]>
Cc Russell King <[email protected]>
Cc Pierre Ossman <[email protected]>
Cc linux-arm-kernel at lists.infradead.org
Cc Andrew Morton <[email protected]>

---
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(-)
drivers/mmc/host/at91_mci.c +0 -1
index e556d42..63924e0 100644
@@ -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>
Signature · 1 line
1.6.4.3
#5 lore raw

PATCH 1/1 mmc: at91_mci: Don't include asm/mach/mmc.h

Uwe Kleine-K?nig :

Quoted 16 lines

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.

Cc Catalin Marinas <[email protected]>
Cc Russell King <[email protected]>
Cc Pierre Ossman <[email protected]>
Cc linux-arm-kernel at lists.infradead.org
Cc Andrew Morton <[email protected]>
Quoted 4 lines

---
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,

Quoted 15 lines
 drivers/mmc/host/at91_mci.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
drivers/mmc/host/at91_mci.c +0 -1
index e556d42..63924e0 100644
@@ -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>
Signature · 1 line
Nicolas Ferre
#6 lore raw

PATCH 1/1 mmc: at91_mci: Don't include asm/mach/mmc.h

Quoted 21 lines · Nicolas Ferre

Uwe Kleine-K?nig :

Quoted 19 lines

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.

Cc Catalin Marinas <[email protected]>
Cc Russell King <[email protected]>
Cc Pierre Ossman <[email protected]>
Cc linux-arm-kernel at lists.infradead.org
Cc Andrew Morton <[email protected]>

---
Hello,

Quoted 9 lines
Quoted 2 lines

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.

Signature · 2 lines
Bill Gatliff
bgat at billgatliff.com
#7 lore raw

PATCH 1/1 mmc: at91_mci: Don't include asm/mach/mmc.h

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.

Cc Catalin Marinas <[email protected]>
Cc Russell King <[email protected]>
Cc Pierre Ossman <[email protected]>
Cc linux-arm-kernel at lists.infradead.org
Cc Andrew Morton <[email protected]>
Cc Linus Torvalds <[email protected]>

---
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(-)
drivers/mmc/host/at91_mci.c +0 -1
index e556d42..63924e0 100644
@@ -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>
Signature · 1 line
1.6.5
#8 lore raw

PATCH 1/1 mmc: at91_mci: Don't include asm/mach/mmc.h

Uwe Kleine-K?nig :

Quoted 6 lines

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,

Signature · 1 line
Nicolas Ferre
#9 lore raw

PATCH 1/1 mmc: at91_mci: Don't include asm/mach/mmc.h

Quoted 10 lines · Nicolas Ferre

Uwe Kleine-König :

Quoted 6 lines

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

Signature · 2 lines
Pengutronix e.K.                              | Uwe Kleine-König            |
Industrial Linux Solutions                    | http://www.pengutronix.de/  |