[PATCH] Fix include paths in malta-amon.c

[PATCH] Fix include paths in malta-amon.c

[David Daney]

On linux-queue, malta doesn't build after the include file relocation.
This should fix it.

There some occurrences of 'asm-mips' in the comments of quite a few
files, but this is the only place I found it in any code.

Signed-off-by: David Daney <ddaney@avtrex.com>
---
 arch/mips/mti-malta/malta-amon.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/mips/mti-malta/malta-amon.c b/arch/mips/mti-malta/malta-amon.c
index 96236bf..df9e526 100644
--- a/arch/mips/mti-malta/malta-amon.c
+++ b/arch/mips/mti-malta/malta-amon.c
@@ -22,9 +22,9 @@
 #include <linux/init.h>
 #include <linux/smp.h>
 
-#include <asm-mips/addrspace.h>
-#include <asm-mips/mips-boards/launch.h>
-#include <asm-mips/mipsmtregs.h>
+#include <asm/addrspace.h>
+#include <asm/mips-boards/launch.h>
+#include <asm/mipsmtregs.h>
 
 int amon_cpu_avail(int cpu)
 {
-- 
1.5.5.1

Re: [PATCH] Fix include paths in malta-amon.c

[Adrian Bunk]

Ralf, can you apply David's patch?

The build error is now in Linus' tree.

TIA
Adrian


On Sat, Sep 20, 2008 at 10:16:36AM -0700, David Daney wrote:
> 
> On linux-queue, malta doesn't build after the include file relocation.
> This should fix it.
> 
> There some occurrences of 'asm-mips' in the comments of quite a few
> files, but this is the only place I found it in any code.
> 
> Signed-off-by: David Daney <ddaney@avtrex.com>
> ---
>  arch/mips/mti-malta/malta-amon.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/mips/mti-malta/malta-amon.c b/arch/mips/mti-malta/malta-amon.c
> index 96236bf..df9e526 100644
> --- a/arch/mips/mti-malta/malta-amon.c
> +++ b/arch/mips/mti-malta/malta-amon.c
> @@ -22,9 +22,9 @@
>  #include <linux/init.h>
>  #include <linux/smp.h>
>  
> -#include <asm-mips/addrspace.h>
> -#include <asm-mips/mips-boards/launch.h>
> -#include <asm-mips/mipsmtregs.h>
> +#include <asm/addrspace.h>
> +#include <asm/mips-boards/launch.h>
> +#include <asm/mipsmtregs.h>
>  
>  int amon_cpu_avail(int cpu)
>  {

Re: [PATCH] Fix include paths in malta-amon.c

[Ralf Baechle]

On Sat, Sep 20, 2008 at 10:16:36AM -0700, David Daney wrote:

> On linux-queue, malta doesn't build after the include file relocation.
> This should fix it.
> 
> There some occurrences of 'asm-mips' in the comments of quite a few
> files, but this is the only place I found it in any code.
> 
> Signed-off-by: David Daney <ddaney@avtrex.com>

Thanks, applied.

  Ralf

Re: [PATCH] Fix include paths in malta-amon.c

[Dmitri Vorobiev]

Ralf Baechle wrote:
> On Sat, Sep 20, 2008 at 10:16:36AM -0700, David Daney wrote:
> 
>> On linux-queue, malta doesn't build after the include file relocation.
>> This should fix it.
>>
>> There some occurrences of 'asm-mips' in the comments of quite a few
>> files, but this is the only place I found it in any code.
>>
>> Signed-off-by: David Daney <ddaney@avtrex.com>
> 
> Thanks, applied.

Hi,

The fix is still not in Linus' tree.

Dmitri

> 
>   Ralf
> 

Re: [PATCH] Fix include paths in malta-amon.c

[Dmitri Vorobiev]

2008/10/31 Dmitri Vorobiev <dmitri.vorobiev@movial.fi>:
> Ralf Baechle wrote:
>> On Sat, Sep 20, 2008 at 10:16:36AM -0700, David Daney wrote:
>>
>>> On linux-queue, malta doesn't build after the include file relocation.
>>> This should fix it.
>>>
>>> There some occurrences of 'asm-mips' in the comments of quite a few
>>> files, but this is the only place I found it in any code.
>>>
>>> Signed-off-by: David Daney <ddaney@avtrex.com>
>>
>> Thanks, applied.
>
> Hi,
>
> The fix is still not in Linus' tree.

Another week, but the fix is still not in Linus' tree.

Dmitri

>
> Dmitri
>
>>
>>   Ralf
>>
>
>
>

Re: [PATCH] Fix include paths in malta-amon.c

[Dmitri Vorobiev]

Dmitri Vorobiev wrote:
> 2008/10/31 Dmitri Vorobiev <dmitri.vorobiev@movial.fi>:
>> Ralf Baechle wrote:
>>> On Sat, Sep 20, 2008 at 10:16:36AM -0700, David Daney wrote:
>>>
>>>> On linux-queue, malta doesn't build after the include file relocation.
>>>> This should fix it.
>>>>
>>>> There some occurrences of 'asm-mips' in the comments of quite a few
>>>> files, but this is the only place I found it in any code.
>>>>
>>>> Signed-off-by: David Daney <ddaney@avtrex.com>
>>> Thanks, applied.
>> Hi,
>>
>> The fix is still not in Linus' tree.
> 
> Another week, but the fix is still not in Linus' tree.

Hi Ralf,

Please let me remind you that this fix is still not in Linus' tree. That is, malta_defconfig still does not build.

Thanks,
Dmitri