git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into upstream.
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
board-rx51-peripherals.c
diff --git
a/arch/arm/mach-omap2/board-rx51-peripherals.c
b/arch/arm/mach-omap2/board-rx51-peripherals.c
index
5f1900c
..
bbcb677
100644
(file)
--- a/
arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/
arch/arm/mach-omap2/board-rx51-peripherals.c
@@
-372,7
+372,7
@@
static struct regulator_consumer_supply rx51_vaux1_consumers[] = {
};
static struct regulator_consumer_supply rx51_vdac_supply[] = {
- REGULATOR_SUPPLY("vdda_dac", "omapdss"),
+ REGULATOR_SUPPLY("vdda_dac", "omapdss
_venc
"),
};
static struct regulator_init_data rx51_vaux1 = {