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 'slub/lockless' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...
[pandora-kernel.git]
/
arch
/
arm
/
mach-mx5
/
mx51_efika.c
diff --git
a/arch/arm/mach-mx5/mx51_efika.c
b/arch/arm/mach-mx5/mx51_efika.c
index
56739c2
..
4435e03
100644
(file)
--- a/
arch/arm/mach-mx5/mx51_efika.c
+++ b/
arch/arm/mach-mx5/mx51_efika.c
@@
-260,8
+260,8
@@
static struct regulator_consumer_supply vvideo_consumers[] = {
};
static struct regulator_consumer_supply vsd_consumers[] = {
};
static struct regulator_consumer_supply vsd_consumers[] = {
- REGULATOR_SUPPLY("vmmc", "sdhci-esdhc-imx.0"),
- REGULATOR_SUPPLY("vmmc", "sdhci-esdhc-imx.1"),
+ REGULATOR_SUPPLY("vmmc", "sdhci-esdhc-imx
51
.0"),
+ REGULATOR_SUPPLY("vmmc", "sdhci-esdhc-imx
51
.1"),
};
static struct regulator_consumer_supply pwgt1_consumer[] = {
};
static struct regulator_consumer_supply pwgt1_consumer[] = {