diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-09 15:07:19 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-09 15:07:19 +0200 |
| commit | 2192482ee5ce5d5d4a6cec0c351b2d3a744606eb (patch) | |
| tree | 15ab3c23d05e98829741b03922b51b81fd102b64 /arch/arm/mach-s5pc100/setup-sdhci.c | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into dev... (diff) | |
| parent | ARM: S5PV210: Fix on missing s3c-sdhci card detection method for hsmmc3 (diff) | |
| download | linux-2192482ee5ce5d5d4a6cec0c351b2d3a744606eb.tar.xz linux-2192482ee5ce5d5d4a6cec0c351b2d3a744606eb.zip | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/mach-s5pc100/setup-sdhci.c')
| -rw-r--r-- | arch/arm/mach-s5pc100/setup-sdhci.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-s5pc100/setup-sdhci.c b/arch/arm/mach-s5pc100/setup-sdhci.c index ea7ff19adb95..f16946e456e9 100644 --- a/arch/arm/mach-s5pc100/setup-sdhci.c +++ b/arch/arm/mach-s5pc100/setup-sdhci.c @@ -26,10 +26,10 @@ /* clock sources for the mmc bus clock, order as for the ctrl2[5..4] */ char *s5pc100_hsmmc_clksrcs[4] = { - [0] = "hsmmc", - [1] = "hsmmc", - /* [2] = "mmc_bus", not yet successfully used yet */ - /* [3] = "48m", - note not successfully used yet */ + [0] = "hsmmc", /* HCLK */ + /* [1] = "hsmmc", - duplicate HCLK entry */ + [2] = "sclk_mmc", /* mmc_bus */ + /* [3] = "48m", - note not successfully used yet */ }; |