diff options
| author | Olof Johansson <olof@lixom.net> | 2012-03-14 03:20:12 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-03-14 03:20:12 +0400 |
| commit | f3d88244dbaf0ba5e4c719f6d5c1a263e85e6bd6 (patch) | |
| tree | 25d034a3afd0aba5f4d96531be6faf217afa9886 /arch/arm/mach-exynos/mach-universal_c210.c | |
| parent | 04cc7bc61c666eb090b51dc5d058b209d01d03be (diff) | |
| parent | f5cca86448af2d6af67808bfbde7dc1ed170f469 (diff) | |
| download | linux-f3d88244dbaf0ba5e4c719f6d5c1a263e85e6bd6.tar.xz | |
Merge branch 'next/devel-samsung-mmc' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers
* 'next/devel-samsung-mmc' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: SAMSUNG: change the name from s3c-sdhci to exynos4-sdhci
mmc: sdhci-s3c: add platform data for the second capability
ARM: SAMSUNG: support the second capability for samsung-soc
Diffstat (limited to 'arch/arm/mach-exynos/mach-universal_c210.c')
| -rw-r--r-- | arch/arm/mach-exynos/mach-universal_c210.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos/mach-universal_c210.c b/arch/arm/mach-exynos/mach-universal_c210.c index 0fc65ffde8ff..f0dcca47fede 100644 --- a/arch/arm/mach-exynos/mach-universal_c210.c +++ b/arch/arm/mach-exynos/mach-universal_c210.c @@ -741,7 +741,7 @@ static struct s3c_sdhci_platdata universal_hsmmc0_data __initdata = { }; static struct regulator_consumer_supply mmc0_supplies[] = { - REGULATOR_SUPPLY("vmmc", "s3c-sdhci.0"), + REGULATOR_SUPPLY("vmmc", "exynos4-sdhci.0"), }; static struct regulator_init_data mmc0_fixed_voltage_init_data = { |