[PATCH] [POWERPC] Fix 8xx compile failure

[PATCH] [POWERPC] Fix 8xx compile failure

[Kumar Gala]

  CC      arch/powerpc/sysdev/commproc.o
arch/powerpc/sysdev/fsl_soc.c: In function fsl_pcmcia_of_init:
arch/powerpc/sysdev/fsl_soc.c:1109: error: implicit declaration of function of_platform_device_create

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---

This patch is in the fixes-2.6.23 branch of my git tree

 arch/powerpc/sysdev/fsl_soc.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index 727453d..f6943fc 100644
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -36,6 +36,7 @@
 #include <sysdev/fsl_soc.h>
 #include <mm/mmu_decl.h>
 #include <asm/cpm2.h>
+#include <asm/of_platform.h>

 extern void init_fcc_ioports(struct fs_platform_info*);
 extern void init_fec_ioports(struct fs_platform_info*);
-- 
1.5.2.2

Re: [PATCH] [POWERPC] Fix 8xx compile failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 593 bytes --]

Hi Kumar,

On Fri, 17 Aug 2007 08:24:02 -0500 (CDT) Kumar Gala <galak@kernel.crashing.org> wrote:
>
> diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
> index 727453d..f6943fc 100644
> --- a/arch/powerpc/sysdev/fsl_soc.c
> +++ b/arch/powerpc/sysdev/fsl_soc.c
> @@ -36,6 +36,7 @@
>  #include <sysdev/fsl_soc.h>
>  #include <mm/mmu_decl.h>
>  #include <asm/cpm2.h>
> +#include <asm/of_platform.h>

linux/of_platform.h should be used these days.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: [PATCH] [POWERPC] Fix 8xx compile failure

[Kumar Gala]

On Aug 17, 2007, at 10:55 AM, Stephen Rothwell wrote:

> Hi Kumar,
>
> On Fri, 17 Aug 2007 08:24:02 -0500 (CDT) Kumar Gala  
> <galak@kernel.crashing.org> wrote:
>>
>> diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/ 
>> fsl_soc.c
>> index 727453d..f6943fc 100644
>> --- a/arch/powerpc/sysdev/fsl_soc.c
>> +++ b/arch/powerpc/sysdev/fsl_soc.c
>> @@ -36,6 +36,7 @@
>>  #include <sysdev/fsl_soc.h>
>>  #include <mm/mmu_decl.h>
>>  #include <asm/cpm2.h>
>> +#include <asm/of_platform.h>
>
> linux/of_platform.h should be used these days.

ok fixed.

- k

Re: [PATCH] [POWERPC] Fix 8xx compile failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 938 bytes --]

Hi Kumar,

On Fri, 17 Aug 2007 11:11:20 -0500 Kumar Gala <galak@kernel.crashing.org> wrote:
>
> On Aug 17, 2007, at 10:55 AM, Stephen Rothwell wrote:
> 
> > On Fri, 17 Aug 2007 08:24:02 -0500 (CDT) Kumar Gala  
> > <galak@kernel.crashing.org> wrote:
> >>
> >> diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/ 
> >> fsl_soc.c
> >> index 727453d..f6943fc 100644
> >> --- a/arch/powerpc/sysdev/fsl_soc.c
> >> +++ b/arch/powerpc/sysdev/fsl_soc.c
> >> @@ -36,6 +36,7 @@
> >>  #include <sysdev/fsl_soc.h>
> >>  #include <mm/mmu_decl.h>
> >>  #include <asm/cpm2.h>
> >> +#include <asm/of_platform.h>
> >
> > linux/of_platform.h should be used these days.
> 
> ok fixed.

I notice that the master branch of your tree has both includes in this
file now :-)  Git's merges are not always perfect.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: [PATCH] [POWERPC] Fix 8xx compile failure

[Kumar Gala]

On Aug 17, 2007, at 11:19 AM, Stephen Rothwell wrote:

> Hi Kumar,
>
> On Fri, 17 Aug 2007 11:11:20 -0500 Kumar Gala  
> <galak@kernel.crashing.org> wrote:
>>
>> On Aug 17, 2007, at 10:55 AM, Stephen Rothwell wrote:
>>
>>> On Fri, 17 Aug 2007 08:24:02 -0500 (CDT) Kumar Gala
>>> <galak@kernel.crashing.org> wrote:
>>>>
>>>> diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/
>>>> fsl_soc.c
>>>> index 727453d..f6943fc 100644
>>>> --- a/arch/powerpc/sysdev/fsl_soc.c
>>>> +++ b/arch/powerpc/sysdev/fsl_soc.c
>>>> @@ -36,6 +36,7 @@
>>>>  #include <sysdev/fsl_soc.h>
>>>>  #include <mm/mmu_decl.h>
>>>>  #include <asm/cpm2.h>
>>>> +#include <asm/of_platform.h>
>>>
>>> linux/of_platform.h should be used these days.
>>
>> ok fixed.
>
> I notice that the master branch of your tree has both includes in this
> file now :-)  Git's merges are not always perfect.

And I had such great hopes for keeping the master branch up to date  
and sane... should all now be fixed.

- k