Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[can-eth-gw-linux.git] / arch / arm / mach-kirkwood / board-openblocks_a6.c

diff --git a/arch/arm/mach-kirkwood/board-openblocks_a6.c b/arch/arm/mach-kirkwood/board-openblocks_a6.c
index e807e8cfdd44a346ab5183a55813b93daa64ecab..815fc6451d526bdf3db94fa082879c1711093e36 100644 (file)
--- a/arch/arm/mach-kirkwood/board-openblocks_a6.c
+++ b/arch/arm/mach-kirkwood/board-openblocks_a6.c
@@ -55,8 +55,8 @@ static unsigned int openblocks_a6_mpp_config[] __initdata = {
        MPP38_GPIO, /* INIT */
        MPP39_GPIO, /* USB OC */
        MPP41_GPIO, /* LED: Red */
-       MPP42_GPIO, /* LED: Yellow */
-       MPP43_GPIO, /* LED: Green */
+       MPP42_GPIO, /* LED: Green */
+       MPP43_GPIO, /* LED: Yellow */
        0,
 };
 
@@ -66,6 +66,5 @@ void __init openblocks_a6_init(void)
         * Basic setup. Needs to be called early.
         */
        kirkwood_mpp_conf(openblocks_a6_mpp_config);
-       kirkwood_ehci_init();
        kirkwood_ge00_init(&openblocks_ge00_data);
 }