[PATCH 1/2] MIPS: msp71xx: fix msp_time build error

[PATCH 1/2] MIPS: msp71xx: fix msp_time build error

[Yoichi Yuasa]

In file included from arch/mips/pmc-sierra/msp71xx/msp_time.c:32:0:
/home/yuasa/src/linux/kernel/git/mips/arch/mips/include/asm/cevt-r4k.h:21:56: error: 'enum clock_event_mode' declared inside parameter list
/home/yuasa/src/linux/kernel/git/mips/arch/mips/include/asm/cevt-r4k.h:21:56: error: its scope is only this definition or declaration, which is probably not what you want
/home/yuasa/src/linux/kernel/git/mips/arch/mips/include/asm/cevt-r4k.h: In function 'handle_perf_irq':
/home/yuasa/src/linux/kernel/git/mips/arch/mips/include/asm/cevt-r4k.h:42:3: error: implicit declaration of function 'perf_irq'
In file included from arch/mips/pmc-sierra/msp71xx/msp_time.c:34:0:
/home/yuasa/src/linux/kernel/git/mips/arch/mips/include/asm/time.h: At top level:
/home/yuasa/src/linux/kernel/git/mips/arch/mips/include/asm/time.h:48:14: error: 'perf_irq' redeclared as different kind of symbol
/home/yuasa/src/linux/kernel/git/mips/arch/mips/include/asm/cevt-r4k.h:42:3: note: previous implicit declaration of 'perf_irq' was here
make[2]: *** [arch/mips/pmc-sierra/msp71xx/msp_time.o] Error 1

Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
---
 arch/mips/pmc-sierra/msp71xx/msp_time.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/arch/mips/pmc-sierra/msp71xx/msp_time.c b/arch/mips/pmc-sierra/msp71xx/msp_time.c
index 8b42f30..9e58c3d 100644
--- a/arch/mips/pmc-sierra/msp71xx/msp_time.c
+++ b/arch/mips/pmc-sierra/msp71xx/msp_time.c
@@ -28,10 +28,11 @@
 #include <linux/spinlock.h>
 #include <linux/module.h>
 #include <linux/ptrace.h>
+#include <linux/clockchips.h>
 
+#include <asm/time.h>
 #include <asm/cevt-r4k.h>
 #include <asm/mipsregs.h>
-#include <asm/time.h>
 
 #include <msp_prom.h>
 #include <msp_int.h>
-- 
1.7.3.4

[PATCH 2/2] MIPS: msp71xx: fix typo in msp_per_irq_controller

[Yoichi Yuasa]

  CC      arch/mips/pmc-sierra/msp71xx/msp_irq_per.o
arch/mips/pmc-sierra/msp71xx/msp_irq_per.c:101:2: error: expected identifier before '.' token
make[2]: *** [arch/mips/pmc-sierra/msp71xx/msp_irq_per.o] Error 1

Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
---
 arch/mips/pmc-sierra/msp71xx/msp_irq_per.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/mips/pmc-sierra/msp71xx/msp_irq_per.c b/arch/mips/pmc-sierra/msp71xx/msp_irq_per.c
index f9b9dcd..98fd009 100644
--- a/arch/mips/pmc-sierra/msp71xx/msp_irq_per.c
+++ b/arch/mips/pmc-sierra/msp71xx/msp_irq_per.c
@@ -97,7 +97,7 @@ static int msp_per_irq_set_affinity(struct irq_data *d,
 
 static struct irq_chip msp_per_irq_controller = {
 	.name = "MSP_PER",
-	.irq_enable = unmask_per_irq.
+	.irq_enable = unmask_per_irq,
 	.irq_disable = mask_per_irq,
 	.irq_ack = msp_per_irq_ack,
 #ifdef CONFIG_SMP
-- 
1.7.3.4

Re: [PATCH 2/2] MIPS: msp71xx: fix typo in msp_per_irq_controller

[Ralf Baechle]

Applied.  Thanks, Yoichi-San,

  Ralf

Re: [PATCH 1/2] MIPS: msp71xx: fix msp_time build error

[Ralf Baechle]

On Tue, Mar 29, 2011 at 03:52:23PM +0900, Yoichi Yuasa wrote:

> diff --git a/arch/mips/pmc-sierra/msp71xx/msp_time.c b/arch/mips/pmc-sierra/msp71xx/msp_time.c
> index 8b42f30..9e58c3d 100644
> --- a/arch/mips/pmc-sierra/msp71xx/msp_time.c
> +++ b/arch/mips/pmc-sierra/msp71xx/msp_time.c
> @@ -28,10 +28,11 @@
>  #include <linux/spinlock.h>
>  #include <linux/module.h>
>  #include <linux/ptrace.h>
> +#include <linux/clockchips.h>
>  
> +#include <asm/time.h>
>  #include <asm/cevt-r4k.h>
>  #include <asm/mipsregs.h>
> -#include <asm/time.h>
>  
>  #include <msp_prom.h>
>  #include <msp_int.h>

I went for a different patch.  Thanks Yoichi-San!

  Ralf