Re: linux-next: manual merge of the tty tree with the slave-dma tree

[Geert Uytterhoeven]

On Tue, Apr 7, 2015 at 11:28 AM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> --- a/drivers/dma/Kconfig
> +++ b/drivers/dma/Kconfig
> @@@ -112,17 -125,8 +112,19 @@@ config FSL_DM
>           EloPlus is on mpc85xx and mpc86xx and Pxxx parts, and the Elo3 is on
>           some Txxx and Bxxx parts.
>
>  +config FSL_RAID
>  +        tristate "Freescale RAID engine Support"
>  +        depends on FSL_SOC && !ASYNC_TX_ENABLE_CHANNEL_SWITCH
>  +        select DMA_ENGINE
>  +        select DMA_ENGINE_RAID
>  +        ---help---
>  +          Enable support for Freescale RAID Engine. RAID Engine is
>  +          available on some QorIQ SoCs (like P5020/P5040). It has
>  +          the capability to offload memcpy, xor and pq computation
>  +        for raid5/6.
>  +
> + source "drivers/dma/hsu/Kconfig"
> +
>   config MPC512X_DMA
>         tristate "Freescale MPC512x built-in DMA engine support"
>         depends on PPC_MPC512x || PPC_MPC831x

Does anyone care about sort order?
The hsu entry ended up in the middle of the Freescale section.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/