From 347fae6c34d4133d90fca07dbe026f0df25c2402 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Wed, 29 Aug 2012 18:58:15 -0700 Subject: [PATCH] --- yaml --- r: 327037 b: refs/heads/master c: 90b85afcba0ec6242172c636691962ab115e296c h: refs/heads/master i: 327035: 6816c3bc34cc46a5a60966273322a556088e7f0b v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-shmobile/board-marzen.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e7044f239a7c..d1461ab49f5f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 894cda18de4b8963b16bc706fea53566df6d7b05 +refs/heads/master: 90b85afcba0ec6242172c636691962ab115e296c diff --git a/trunk/arch/arm/mach-shmobile/board-marzen.c b/trunk/arch/arm/mach-shmobile/board-marzen.c index dec3ffc9df09..cbf9f25ed972 100644 --- a/trunk/arch/arm/mach-shmobile/board-marzen.c +++ b/trunk/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();