Patchwork ARM: ux500: fix compile error in new timer code

login
register
mail settings
Submitter Lee Jones
Date March 28, 2012, 10:49 a.m.
Message ID <1332931787-27741-1-git-send-email-lee.jones@linaro.org>
Download mbox | patch
Permalink /patch/149181/
State New
Headers show

Comments

Lee Jones - March 28, 2012, 10:49 a.m.
This patch fixes the errors below:

error: implicit declaration of function ‘pr_err’
error: implicit declaration of function ‘BUG’

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/mach-ux500/timer.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
Linus Walleij - March 28, 2012, 5:37 p.m.
On Wed, Mar 28, 2012 at 12:49 PM, Lee Jones <lee.jones@linaro.org> wrote:

> This patch fixes the errors below:
>
> error: implicit declaration of function ‘pr_err’
> error: implicit declaration of function ‘BUG’
>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>

Acked-by: Linus Walleij <linus.walleij@linaro.org>

I'll apply and funnel to ARM-SoC when I'm back in Europe unless
you want to push it to Arnd/Olof directly.

Thanks,
Linus Walleij
Arnd Bergmann - March 29, 2012, 1:43 p.m.
On Wednesday 28 March 2012, Linus Walleij wrote:
> On Wed, Mar 28, 2012 at 12:49 PM, Lee Jones <lee.jones@linaro.org> wrote:
> 
> > This patch fixes the errors below:
> >
> > error: implicit declaration of function ‘pr_err’
> > error: implicit declaration of function ‘BUG’
> >
> > Signed-off-by: Lee Jones <lee.jones@linaro.org>
> 
> Acked-by: Linus Walleij <linus.walleij@linaro.org>
> 
> I'll apply and funnel to ARM-SoC when I'm back in Europe unless
> you want to push it to Arnd/Olof directly.

I've applied it now to the fixes branch, as I'm collecting other patches
as well.

	Arnd

Patch

diff --git a/arch/arm/mach-ux500/timer.c b/arch/arm/mach-ux500/timer.c
index e9d5807..21ec778 100644
--- a/arch/arm/mach-ux500/timer.c
+++ b/arch/arm/mach-ux500/timer.c
@@ -4,6 +4,8 @@ 
  * License Terms: GNU General Public License v2
  * Author: Mattias Wallin <mattias.wallin@stericsson.com> for ST-Ericsson
  */
+#include <linux/kernel.h>
+#include <linux/bug.h>
 #include <linux/io.h>
 #include <linux/errno.h>
 #include <linux/clksrc-dbx500-prcmu.h>