• Paul Gortmaker's avatar
    ARM: bcmring: fix UART declarations · 888073d4
    Paul Gortmaker authored
    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 8ede1ae6
    
        "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: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
    [olof: reworded patch subject]
    Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
    888073d4
core.c 6.47 KB