Re: [PATCH] colibri.h: Fix building for colibri 270...

From: Jakob Viketoft
Date: Wed May 05 2010 - 07:28:29 EST


Hello!

I didn't see this first as the e-mail address jakob.viketoft@xxxxxxxxxx is being shut down (changing jobs).

Eric Miao wrote:
On Wed, May 5, 2010 at 5:53 PM, Daniel Mack <daniel@xxxxxxxx> wrote:
On Wed, May 05, 2010 at 05:47:14PM +0800, Eric Miao wrote:
On Wed, May 5, 2010 at 5:44 PM, Daniel Mack <daniel@xxxxxxxx> wrote:
And I'm not able to find
drivers/pcmcia/pxa2xx_colibri.c as well.
Erm - how is that related to the patch in question?

The error seems to be (as in previous mail):

CC drivers/pcmcia/pxa2xx_colibri.o
In file included from drivers/pcmcia/pxa2xx_colibri.c:25:
arch/arm/mach-pxa/include/mach/colibri.h:13: error: expected ')'
before '*' token
make[2]: *** [drivers/pcmcia/pxa2xx_colibri.o] Error 1
make[1]: *** [drivers/pcmcia] Error 2
make: *** [drivers] Error 2
Ah, sorry.

The pcmcia-patch isn't my work, but that of Alex A. Mihaylov (minimumlaw@xxxxxxxxxx). I was hoping that he would be pushing those bits upstream separately, but I think some things needs to me shifted around a bit to be accepted.


And actually, inclusion of <mach/mfp.h> is better to be placed where it's
used, i.e. drivers/pcmcia/pxa2xx_colibri.c.
In general I agree, but in this case, mfp_t is used in this header file,
so every piece of code which includes colibri.h will need both
<mach/mfp.h> and <net/ax88796.h>. And as this is a rule for all users, I
think the right place for the inclusion is the header file?


I see.

Acked-by: Eric Miao <eric.y.miao@xxxxxxxxx>

Thanks.



Apart from that, this fix will work for both mainline and -stable, which
makes things easier :)


I'll take it to -pxa then.

Sounds good!

/Jakob

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