lkml.org 
[lkml]   [2014]   [Jul]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCHv3 07/34] ARM: at91: prepare common clk transition for sam9260
    Date
    Enclose the sam9260 old clk registration in "#if defined(CONFIG_OLD_CLK_AT91)
    #endif"

    Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
    ---
    arch/arm/mach-at91/at91sam9260.c | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c
    index c3d22be73b7c..3477ba94c4c5 100644
    --- a/arch/arm/mach-at91/at91sam9260.c
    +++ b/arch/arm/mach-at91/at91sam9260.c
    @@ -27,10 +27,11 @@
    #include "at91_rstc.h"
    #include "soc.h"
    #include "generic.h"
    -#include "clock.h"
    #include "sam9_smc.h"
    #include "pm.h"

    +#if defined(CONFIG_OLD_CLK_AT91)
    +#include "clock.h"
    /* --------------------------------------------------------------------
    * Clocks
    * -------------------------------------------------------------------- */
    @@ -288,6 +289,9 @@ static void __init at91sam9260_register_clocks(void)
    clk_register(&pck0);
    clk_register(&pck1);
    }
    +#else
    +#define at91sam9260_register_clocks NULL
    +#endif

    /* --------------------------------------------------------------------
    * GPIO
    --
    1.9.1


    \
     
     \ /
      Last update: 2014-07-09 18:41    [W:4.099 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site