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

> Hi Kumar,
>
> On Fri, 17 Aug 2007 11:11:20 -0500 Kumar Gala  
> <[EMAIL PROTECTED]> wrote:
>>
>> On Aug 17, 2007, at 10:55 AM, Stephen Rothwell wrote:
>>
>>> On Fri, 17 Aug 2007 08:24:02 -0500 (CDT) Kumar Gala
>>> <[EMAIL PROTECTED]> 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
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev

Reply via email to