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 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
arm
/
mach-imx
/
mach-pcm038.c
diff --git
a/arch/arm/mach-imx/mach-pcm038.c
b/arch/arm/mach-imx/mach-pcm038.c
index
f667a26
..
5056148
100644
(file)
--- a/
arch/arm/mach-imx/mach-pcm038.c
+++ b/
arch/arm/mach-imx/mach-pcm038.c
@@
-254,10
+254,10
@@
static struct regulator_init_data cam_data = {
static struct mc13783_regulator_init_data pcm038_regulators[] = {
{
static struct mc13783_regulator_init_data pcm038_regulators[] = {
{
- .id = MC13783_REG
U
_VCAM,
+ .id = MC13783_REG_VCAM,
.init_data = &cam_data,
}, {
.init_data = &cam_data,
}, {
- .id = MC13783_REG
U
_VMMC1,
+ .id = MC13783_REG_VMMC1,
.init_data = &sdhc1_data,
},
};
.init_data = &sdhc1_data,
},
};