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 'stable/gntdev' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
[pandora-kernel.git]
/
arch
/
arm
/
mach-mx3
/
mach-mx31moboard.c
diff --git
a/arch/arm/mach-mx3/mach-mx31moboard.c
b/arch/arm/mach-mx3/mach-mx31moboard.c
index
203d21a
..
1aa8d65
100644
(file)
--- a/
arch/arm/mach-mx3/mach-mx31moboard.c
+++ b/
arch/arm/mach-mx3/mach-mx31moboard.c
@@
-216,11
+216,11
@@
static struct regulator_init_data cam_vreg_data = {
static struct mc13783_regulator_init_data moboard_regulators[] = {
{
- .id = MC13783_REG
U
_VMMC1,
+ .id = MC13783_REG_VMMC1,
.init_data = &sdhc_vreg_data,
},
{
- .id = MC13783_REG
U
_VCAM,
+ .id = MC13783_REG_VCAM,
.init_data = &cam_vreg_data,
},
};