]> git.baikalelectronics.ru Git - kernel.git/commit
ARM: bcmring: fix UART declarations
authorPaul Gortmaker <paul.gortmaker@windriver.com>
Mon, 16 Apr 2012 19:38:28 +0000 (15:38 -0400)
committerOlof Johansson <olof@lixom.net>
Thu, 19 Apr 2012 04:21:45 +0000 (21:21 -0700)
commit1c2963179743edcd9eaa66f9e72a10abd1fa571e
tree1908359e2e7508d5ada657d204fc2e7bf9873bb9
parent740b2d3017bc8c0c65f4841f65aee0feba479636
ARM: bcmring: fix UART declarations

This error appeared in the bcmring_defconfig build:

  CC      arch/arm/mach-bcmring/core.o
arch/arm/mach-bcmring/core.c:55: error: macro "AMBA_APB_DEVICE" requires 6 arguments, but only 5 given
arch/arm/mach-bcmring/core.c:55: warning: type defaults to 'int' in declaration of 'AMBA_APB_DEVICE'
arch/arm/mach-bcmring/core.c:56: error: macro "AMBA_APB_DEVICE" requires 6 arguments, but only 5 given
arch/arm/mach-bcmring/core.c:56: warning: type defaults to 'int' in declaration of 'AMBA_APB_DEVICE'
arch/arm/mach-bcmring/core.c:134: error: 'uartA_device' undeclared here (not in a function)
arch/arm/mach-bcmring/core.c:135: error: 'uartB_device' undeclared here (not in a function)
make[2]: *** [arch/arm/mach-bcmring/core.o] Error 1

It appeared as of commit 1b76729b21ef616b8565e71a536158a61a86b63b

    "ARM: amba: bcmring: use common amba device initializers"

Note that in include/linux/amba/bus.h we have:
   #define AMBA_APB_DEVICE(name, busid, id, base, irqs, data) ...

There is an a --> A case error in the busid and a missing zero
placeholder for the id field.

Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
[olof: reworded patch subject]
Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/mach-bcmring/core.c