Linux MIPS Architecture development
 help / color / mirror / Atom feed
From: Yoichi Yuasa <yuasa@linux-mips.org>
To: Ralf Baechle <ralf@linux-mips.org>
Cc: yuasa@linux-mips.org, linux-mips <linux-mips@linux-mips.org>
Subject: [PATCH 1/2] MIPS: msp71xx: fix msp_time build error
Date: Tue, 29 Mar 2011 15:52:23 +0900	[thread overview]
Message-ID: <20110329155223.08fbef97.yuasa@linux-mips.org> (raw)

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

             reply	other threads:[~2011-03-29  6:54 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-29  6:52 Yoichi Yuasa [this message]
2011-03-29  6:53 ` [PATCH 2/2] MIPS: msp71xx: fix typo in msp_per_irq_controller Yoichi Yuasa
2011-03-29 14:00   ` Ralf Baechle
2011-03-29 14:10 ` [PATCH 1/2] MIPS: msp71xx: fix msp_time build error Ralf Baechle

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110329155223.08fbef97.yuasa@linux-mips.org \
    --to=yuasa@linux-mips.org \
    --cc=linux-mips@linux-mips.org \
    --cc=ralf@linux-mips.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox