linux-next: manual merge of the akpm tree with the arm-soc tree

Turquette, Mike mturquette at ti.com
Mon May 14 17:57:56 EDT 2012


On Mon, May 14, 2012 at 2:24 AM, Stephen Rothwell <sfr at canb.auug.org.au> wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm tree got a conflict in
> drivers/clk/Kconfig between commit d269b974e32c ("clk: remove
> COMMON_CLK_DISABLE_UNUSED") from the arm-soc tree and commit "clk: remove
> redundant depends on from drivers/Kconfig" from the akpm tree.
>
> I fixed it up (see below) and can carry the fix as necessary.

Hi Stephen,

The fix-up is correct.

Thanks,
Mike

> --
> Cheers,
> Stephen Rothwell                    sfr at canb.auug.org.au
>
> diff --cc drivers/clk/Kconfig
> index 4864407,4f10a21..0000000
> --- a/drivers/clk/Kconfig
> +++ b/drivers/clk/Kconfig
> @@@ -23,9 -22,18 +23,8 @@@ config COMMON_CL
>  menu "Common Clock Framework"
>        depends on COMMON_CLK
>
>  -config COMMON_CLK_DISABLE_UNUSED
>  -      bool "Disabled unused clocks at boot"
>  -      ---help---
>  -        Traverses the entire clock tree and disables any clocks that are
>  -        enabled in hardware but have not been enabled by any device drivers.
>  -        This saves power and keeps the software model of the clock in line
>  -        with reality.
>  -
>  -        If in doubt, say "N".
>  -
>  config COMMON_CLK_DEBUG
>        bool "DebugFS representation of clock tree"
> -       depends on COMMON_CLK
>        select DEBUG_FS
>        ---help---
>          Creates a directory hierchy in debugfs for visualizing the clk
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>



More information about the linux-arm-kernel mailing list