---

yaml --- r: 365044 b: refs/heads/master c: fa67952 h: refs/heads/master v: v3
git-mirror · Mar 28, 2013 · c5c4845 · c5c4845
1 parent 69e7249
commit c5c4845
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5379f026613b7ecc7e46f15b2aad377177bb0e81
+refs/heads/master: fa679523b68e1a2f9d99d5e714e022a4327e13a8
diff --git a/trunk/arch/arm/mach-ux500/board-mop500-regulators.c b/trunk/arch/arm/mach-ux500/board-mop500-regulators.c
@@ -80,6 +80,8 @@ static struct regulator_consumer_supply ab8500_vaux1_consumers[] = {
 	REGULATOR_SUPPLY("vdd", "2-005c"),
 	/* Cypress TrueTouch Touchscreen device */
 	REGULATOR_SUPPLY("vcpin", "spi8.0"),
+	/* Camera device */
+	REGULATOR_SUPPLY("vaux12v5", "mmio_camera"),
 };
 
 static struct regulator_consumer_supply ab8500_vaux2_consumers[] = {