From 90b85afcba0ec6242172c636691962ab115e296c Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Wed, 29 Aug 2012 18:58:15 -0700 Subject: [PATCH] ARM: shmobile: marzen: fixup regulator id for smsc911x regulator id = 0 is used for sh_mobile_sdhi. smsc911x's regulator can use id = 1 Signed-off-by: Kuninori Morimoto Signed-off-by: Simon Horman --- arch/arm/mach-shmobile/board-marzen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c index dec3ffc9df09..cbf9f25ed972 100644 --- a/arch/arm/mach-shmobile/board-marzen.c +++ b/arch/arm/mach-shmobile/board-marzen.c @@ -120,7 +120,7 @@ static void __init marzen_init(void) { regulator_register_always_on(0, "fixed-3.3V", fixed3v3_power_consumers, ARRAY_SIZE(fixed3v3_power_consumers), 3300000); - regulator_register_fixed(0, dummy_supplies, + regulator_register_fixed(1, dummy_supplies, ARRAY_SIZE(dummy_supplies)); r8a7779_pinmux_init(); -- 2.39.5