---

yaml --- r: 327037 b: refs/heads/master c: 90b85af h: refs/heads/master i: 327035: 6816c3b v: v3
git-mirror · Sep 6, 2012 · 347fae6 · 347fae6
1 parent 56eca55
commit 347fae6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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();