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 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
arch
/
arm
/
mach-mx3
/
mach-mx31_3ds.c
diff --git
a/arch/arm/mach-mx3/mach-mx31_3ds.c
b/arch/arm/mach-mx3/mach-mx31_3ds.c
index
4e516b4
..
0d65db8
100644
(file)
--- a/
arch/arm/mach-mx3/mach-mx31_3ds.c
+++ b/
arch/arm/mach-mx3/mach-mx31_3ds.c
@@
-140,17
+140,17
@@
static struct regulator_init_data gpo_init = {
static struct mc13783_regulator_init_data mx31_3ds_regulators[] = {
{
static struct mc13783_regulator_init_data mx31_3ds_regulators[] = {
{
- .id = MC13783_REG
U
_PWGT1SPI, /* Power Gate for ARM core. */
+ .id = MC13783_REG_PWGT1SPI, /* Power Gate for ARM core. */
.init_data = &pwgtx_init,
}, {
.init_data = &pwgtx_init,
}, {
- .id = MC13783_REG
U
_PWGT2SPI, /* Power Gate for L2 Cache. */
+ .id = MC13783_REG_PWGT2SPI, /* Power Gate for L2 Cache. */
.init_data = &pwgtx_init,
}, {
.init_data = &pwgtx_init,
}, {
- .id = MC13783_REG
U
_GPO1, /* Turn on 1.8V */
+ .id = MC13783_REG_GPO1, /* Turn on 1.8V */
.init_data = &gpo_init,
}, {
.init_data = &gpo_init,
}, {
- .id = MC13783_REG
U
_GPO3, /* Turn on 3.3V */
+ .id = MC13783_REG_GPO3, /* Turn on 3.3V */
.init_data = &gpo_init,
},
};
.init_data = &gpo_init,
},
};