On Thursday 27 September 2012, Thomas Petazzoni wrote:

This select was already part added as a part of:

commit 7e8d941567c99a03390154a7bb116d1b03db82b3
Author: Sebastian Hesselbarth [off-list ref]
Date:   Thu Sep 13 17:41:43 2012 +0200

    pinctrl: mvebu: pinctrl driver core
    
    This patch adds a pinctrl driver core for Marvell SoCs plus DT
    binding documentation. This core driver will be used by SoC family
    specific drivers, i.e. Armada XP, Armada 370, Dove, Kirkwood, aso.
    
    Signed-off-by: Sebastian Hesselbarth [off-list ref]
    Signed-off-by: Thomas Petazzoni [off-list ref]
    Acked-by: Thomas Petazzoni [off-list ref]
    Tested-by: Thomas Petazzoni [off-list ref]
    Reviewed-by: Stephen Warren [off-list ref]
    Signed-off-by: Jason Cooper [off-list ref]
    
    Conflicts:
    
        arch/arm/Kconfig

which was requested for pull from the kirkwood/drivers branch of Jason
Cooper repository. If it is no longer there, then it is a merge
conflict resolution mistake.

I believe it was lost again in the move to the multiplatform configuration,
which moves the ARCH_MVEBU definition to arch/arm/mach-mvebu/Kconfig.
automated merges with git don't notice this. Same for the other one.

	Arnd