2010-04-16 11:45:56

by Jakob Viketoft

[permalink] [raw]
Subject: [PATCH] colibri.h: #include corrections

The use of mfp_cfg_t causes build errors without including <mach/mfp.h>.
The include for the ax88796 is kicked as well since it's inclusion is
obsoleted as adviced by Daniel Mack.

CC: [email protected]
CC: Daniel Mack <[email protected]>
CC: Eric Miao <[email protected]>
Signed-off-by Jakob Viketoft <[email protected]>


--- a/arch/arm/mach-pxa/include/mach/colibri.h 2010-03-15
17:09:39.000000000 +0100
+++ b/arch/arm/mach-pxa/include/mach/colibri.h 2010-04-16
13:30:43.000000000 +0200
@@ -1,7 +1,7 @@
#ifndef _COLIBRI_H_
#define _COLIBRI_H_

-#include <net/ax88796.h>
+#include <mach/mfp.h>

/*
* common settings for all modules


2010-04-16 11:48:39

by Daniel Mack

[permalink] [raw]
Subject: Re: [PATCH] colibri.h: #include corrections

On Fri, Apr 16, 2010 at 01:45:48PM +0200, Jakob Viketoft wrote:
> The use of mfp_cfg_t causes build errors without including
> <mach/mfp.h>. The include for the ax88796 is kicked as well since
> it's inclusion is obsoleted as adviced by Daniel Mack.

Argh, I'm sorry. This time, I was too fast. The ax88796 must stay, I
overlooked the use of ax_plat_data.

Daniel

> CC: [email protected]
> CC: Daniel Mack <[email protected]>
> CC: Eric Miao <[email protected]>
> Signed-off-by Jakob Viketoft <[email protected]>

> --- a/arch/arm/mach-pxa/include/mach/colibri.h 2010-03-15
> 17:09:39.000000000 +0100
> +++ b/arch/arm/mach-pxa/include/mach/colibri.h 2010-04-16
> 13:30:43.000000000 +0200
> @@ -1,7 +1,7 @@
> #ifndef _COLIBRI_H_
> #define _COLIBRI_H_
>
> -#include <net/ax88796.h>
> +#include <mach/mfp.h>
>
> /*
> * common settings for all modules
>

2010-04-16 11:52:38

by Jakob Viketoft

[permalink] [raw]
Subject: Re: [PATCH] colibri.h: #include corrections

Daniel Mack wrote:
> On Fri, Apr 16, 2010 at 01:45:48PM +0200, Jakob Viketoft wrote:
>> The use of mfp_cfg_t causes build errors without including
>> <mach/mfp.h>. The include for the ax88796 is kicked as well since
>> it's inclusion is obsoleted as adviced by Daniel Mack.
>
> Argh, I'm sorry. This time, I was too fast. The ax88796 must stay, I
> overlooked the use of ax_plat_data.
>
> Daniel

There's gremlins in here somewhere, I'm sure. ;) I'll try one more time...

/Jakob

>
>> CC: [email protected]
>> CC: Daniel Mack <[email protected]>
>> CC: Eric Miao <[email protected]>
>> Signed-off-by Jakob Viketoft <[email protected]>
>
>> --- a/arch/arm/mach-pxa/include/mach/colibri.h 2010-03-15
>> 17:09:39.000000000 +0100
>> +++ b/arch/arm/mach-pxa/include/mach/colibri.h 2010-04-16
>> 13:30:43.000000000 +0200
>> @@ -1,7 +1,7 @@
>> #ifndef _COLIBRI_H_
>> #define _COLIBRI_H_
>>
>> -#include <net/ax88796.h>
>> +#include <mach/mfp.h>
>>
>> /*
>> * common settings for all modules
>>
>