lkml.org 
[lkml]   [2014]   [Mar]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13 059/149] ARM: 7991/1: sa1100: fix compile problem on Collie
    Date
    3.13-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Linus Walleij <linus.walleij@linaro.org>

    commit 052450fdc55894a39fbae93d9bbe43947956f663 upstream.

    Due to a problem in the MFD Kconfig it was not possible to
    compile the UCB battery driver for the Collie SA1100 system,
    in turn making it impossible to compile in the battery driver.
    (See patch "mfd: include all drivers in subsystem menu".)

    After fixing the MFD Kconfig (separate patch) a compile error
    appears in the Collie battery driver due to the <mach/collie.h>
    implicitly requiring <mach/hardware.h> through <linux/gpio.h>
    via <mach/gpio.h> prior to commit
    40ca061b "ARM: 7841/1: sa1100: remove complex GPIO interface".

    Fix this up by including the required header into
    <mach/collie.h>.

    Cc: Andrea Adami <andrea.adami@gmail.com>
    Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/arm/mach-sa1100/include/mach/collie.h | 2 ++
    1 file changed, 2 insertions(+)

    --- a/arch/arm/mach-sa1100/include/mach/collie.h
    +++ b/arch/arm/mach-sa1100/include/mach/collie.h
    @@ -13,6 +13,8 @@
    #ifndef __ASM_ARCH_COLLIE_H
    #define __ASM_ARCH_COLLIE_H

    +#include "hardware.h" /* Gives GPIO_MAX */
    +
    extern void locomolcd_power(int on);

    #define COLLIE_SCOOP_GPIO_BASE (GPIO_MAX + 1)



    \
     
     \ /
      Last update: 2014-03-21 04:01    [W:3.520 / U:0.252 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site